Compare commits

...

1408 Commits
v115 ... v126

Author SHA1 Message Date
Anuken
24195dac81 Added Voz-Duh's large launch pad sprite (#4861) 2021-03-05 14:27:15 -05:00
Joshua Fan
830fe03898 Add buildSpeedMultiplier status effect (#4816)
* Make disarmed status effect prevent building

* Revert disarmed changes, add buildSpeedMultiplier status

* Add buildSpeedMultiplier to StatusComp
2021-03-05 14:09:46 -05:00
Anuken
4690aae197 Fixed cores being replaceable 2021-03-05 14:00:53 -05:00
Anuken
b82dca89b3 Merge remote-tracking branch 'origin/master' 2021-03-05 12:06:44 -05:00
Anuken
dce79a621a Close connections immediately on kick 2021-03-05 12:06:40 -05:00
buthed010203
d6f00a5d2d Remove dead servers from v5 server list (#4858)
From what I can see, atnanner is the only network that still hosts any v5 servers, all the others are either on v6 or are offline.
2021-03-05 11:59:44 -05:00
Anuken
545b75a091 [Модификация] Доступен -> Доступна 2021-03-05 11:38:57 -05:00
Anuken
979daca221 Merge remote-tracking branch 'origin/master' 2021-03-05 11:36:15 -05:00
Anuken
fb2fed7c28 mod.multiplayer.compatible RU 2021-03-05 11:36:11 -05:00
YellOw139
0ec71750b7 [Bundle][RO] Update (#4750)
* [Bundle][RO] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit f78719afc0
- Typo fixes & various other improvements

* WIP

* typo

* Speaking logically

* Update core/assets/bundles/bundle_ro.properties

Co-authored-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>

* Opted for a better term: controlor, not controller

* double-tap

* Times joined & kicked

Co-authored-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>
2021-03-05 11:30:55 -05:00
BlueTechno
51f7858b78 Added "armor" and "buildingdamage" stats (#4794)
Also fixed the description of the separator (so it matches the english description)
2021-03-05 11:30:45 -05:00
PolgarSasa
ab83b872a2 Update bundle_hu.properties (#4790) 2021-03-05 11:30:39 -05:00
Sharlotte
879adb7458 [KO] Update bundle_ko.properties (#4803)
* Update bundle_ko.properties

* translated recent changing

* https://github.com/Anuken/Mindustry/pull/4844

* Update bundle_ko.properties

* Add files via upload

* unofficial details
2021-03-05 11:29:26 -05:00
Catchears
39cbd607ef update german translation (#4826)
* update german translation to 781410ea04

* change from stuffyAI

* update german translation to ae838b9392
2021-03-05 11:29:18 -05:00
Antsiferov Andrew
7478cdf4a4 [Bundle][RU] actual L10n (#4748)
* 3 new, 1 deleted

New:
rules.unitcapvariable
rules.unitcap
laccess.color

Deleted:
lenum.color

* 1 line changed

rules.unitcap

* 2 new, 1 deleted

New:
mods.initfailed
setting.modcrashdisable.name

Deleted:
mods.alphainfo
-
Отключение модов после вылета на старте

* Fixed #4715

* Content parser class discovery improvements

* Use github build status (#4718)

Why does this still use travis? It was ditched months ago

* Make status colors the same (#4719)

It bothers me ok

* Better splash damage handling for small radii

* Fixed #4729

* Uncap content names in resolution

* Fixed UnitReq parsing

* Fixed #4732

* Allow JSON mod content types from other class loaders

* Better JSON null validation / Disable mods on startup crash

* Logic tooltips on mobile devices w/ long-press

* Add Survival and PvP servers (#4736)

* Update servers_v6.json (#4735)

add 1 more server for CxZx

* arc

* Balance tweaks

* Fixing remaining typos\errors in bundle_fr (#4397)

* Fixing remaining typos errors in bundle_fr

There are some errors that had managed to get through the verification. Imma chase them down!

* added logic hints and some typo fixes

* Fixing 2 typos in bundle.properties

L1548: Color statement affects every following draw operations.

* smolfixes

* Fixed "fix" in #4397

* [Bundle][RO] Update (#4725)

* [Bundle][RO] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit 1ef7ae7079
- Typo fixes & various other improvements

* Reducing confusion

* Update bundle_ro.properties

* Fixing typos and descriptions [bundle_es.properties] (#4727)

* Fixing and descriptions [bundle_es.properties]

* Forgot something

* Update Logic Draw Hints (#4734)

Wrapped up some previous logic hints, too.

* german translation for build 125, full android translation (#4703)

* update german translation to 631e4d9eef

* update android translation to e816f6110d

with regard to 5ec5f1aa93

* improve translation with ideas from others

* update german steam discription to e86a3e9d09

* update german translation to 1ef7ae7079 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c)

* changes from stuffyAI

* cross-platform as suggested by stuffyAI

* stuffyAI

genau, hast recht

Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>

Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>

* Update bundle_vi.properties (#4724)

* Fixed mod crash disable setting name

* Various fixes

* Steam icon changes

* arc

* Update Vietnamese Translation. (#4660)

* Update translation, fix some typo

* About 150 lines to do left.

* Typos fix #_1

* Typos fix + add trans

* Update to lastest commit.

* Base logic translation.

* a lot of typo ...

* some update from main bundle.

* Add more logic hint.

* translated recent update (#4742)

* Move update function of resupply point 5x1 spaces back (#4746)

* Remove stray spaces from accelerator (#4465)

* 10 new lines
graphicstype.clear
graphicstype.color
graphicstype.stroke
graphicstype.line
graphicstype.rect
graphicstype.linerect
graphicstype.poly
graphicstype.linepoly
graphicstype.triangle
graphicstype.image

* 1 line changed
lenum.stop (typo)

* 6 new lines

logic.nounitbuild
laccess.controller
laccess.dead
laccess.controlled
laccess.commanded
lenum.idle

* 1 new line

setting.doubletapmine.name

* 2 new, 2 changed

New:
trace.times.joined
trace.times.kicked

Changed:
unit.seconds
unit.minutes

* 1 line changed

trace.times.joined

* 1 new line

mod.multiplayercompatable
-
quick commit before potential merge, might fix it later

Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: buthed010203 <naguiar010203@gmail.com>
Co-authored-by: Fatonndev <56699208+Fatonndev@users.noreply.github.com>
Co-authored-by: CxZxRainzz <78591136+CxZxRainzz@users.noreply.github.com>
Co-authored-by: Phinner <62483793+Phinner@users.noreply.github.com>
Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>
Co-authored-by: BlueThecno <69437358+BlueThecno@users.noreply.github.com>
Co-authored-by: 彭瑞暄 <raymondpeng0725@gmail.com>
Co-authored-by: Catchears <57631841+Catchears@users.noreply.github.com>
Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>
Co-authored-by: Arnyyx <74717260+Arnyyx@users.noreply.github.com>
Co-authored-by: Ngọc Lam <33188123+NgLamVN@users.noreply.github.com>
Co-authored-by: Sharlotte <60801210+Sharlottes@users.noreply.github.com>
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
2021-03-05 11:28:28 -05:00
Patrick 'Quezler' Mounier
b75a8d5260 Fix typo to preserve sanity (#4857)
* compatable > compatible

* compatable > compatible
2021-03-05 11:27:51 -05:00
MEEP of Faith
120c694a42 Mention Foreshadow's special targeting in its description. (#4419)
* Mention Foreshadow special targetting.

* Better wording
2021-03-05 11:25:58 -05:00
MEEP of Faith
569293e577 Shadow with width/height (#4609) 2021-03-05 11:21:23 -05:00
Anuken
4f0f2499be mod.multiplayercompatable in gray 2021-03-05 11:19:55 -05:00
MEEP of Faith
d34dd0c603 Add message for mods that have hidden = true (#4717)
* Multiplayer compatability message

* Make more sense?
2021-03-05 11:17:55 -05:00
Anuken
b6c645b701 Better DefenderAI / Vela building / Anuken/Mindustry-Suggestions/issues/2074 2021-03-05 11:10:12 -05:00
MEEP of Faith
0c28bb7dcf DefenderAI that makes octs follow units (#4757) 2021-03-05 10:21:26 -05:00
Anuken
2bb303e709 Fixed #4856 2021-03-04 18:41:30 -05:00
Anuken
cc65feb392 Added ConnectionEvent 2021-03-04 18:39:47 -05:00
Anuken
c12b9ee3e3 Minor network packet handling tweaks 2021-03-04 17:58:28 -05:00
Anuken
d863c971c2 Gradle update / Mech animation fixes / Formation movement tweaks 2021-03-04 13:40:50 -05:00
MEEP of Faith
3ccdf45ed1 Is this what you wanted sk? (#4848) 2021-03-04 10:38:47 -05:00
Javier Domingo Cansino
efa5c5db7b Enable client to use a different data dir through env MINDUSTRY_DATA_DIR (#4851) 2021-03-04 10:34:23 -05:00
Anuken
d73cf9fcff Prevent early return in PowerNode config render 2021-03-03 14:42:41 -05:00
Anuken
93dafc82eb Fixed #4847 2021-03-03 12:44:56 -05:00
Anuken
87142b06c3 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-03-03 10:49:57 -05:00
Anuken
3075616b03 arc 2021-03-03 10:49:52 -05:00
buthed010203
019898dfc3 Turrets can properly replace eachother, cores can replace conveyors and minor cleanup. (#4841) 2021-03-03 09:15:50 -05:00
Patrick 'Quezler' Mounier
ae838b9392 Trace times joined & kicked (#4844)
* Trace times joined & kicked

* Make mindustry.* import obsolete
2021-03-03 09:09:05 -05:00
Anuken
4d9a30b7c7 Merge remote-tracking branch 'origin/master' 2021-03-02 18:45:22 -05:00
Anuken
ea82773157 Non-overdriveable core / Spurious mod warning fix 2021-03-02 18:45:18 -05:00
buthed010203
8289da1415 Nuclear reactor schem priority of -5 (#4840)
* Nuclear reactor schem priority of -5
2021-03-02 10:49:22 -05:00
Anuken
19eb6334b7 Merge remote-tracking branch 'origin/master' 2021-03-02 09:28:42 -05:00
Anuken
e992be1bfb Higher LogicBlock schem priority 2021-03-02 09:28:38 -05:00
MEEP of Faith
7e216d198e Remove duplicates and mild formatting. (#4837)
* Remove duplicate definitions in UnitTypes

* If Tsunami is indented, so should the others

It looks nicer as well.
2021-03-02 09:28:04 -05:00
MEEP of Faith
a89d50e74d Cursor should not change for other teams when hovering over doors and construction. (#4838)
* Cursor should not change for other teams.

* Use Built-in interaction check

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

* Building should use built-in check, same treatment for ConstructBlock

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
2021-03-02 09:25:15 -05:00
Anuken
05dc13c922 Fixed #4830 2021-03-01 13:06:47 -05:00
Patrick 'Quezler' Mounier
1de4dd1bfe Call super.drawPlace for menders & overdrives (#4831) 2021-03-01 13:02:27 -05:00
Anuken
72aa87128e Merge remote-tracking branch 'origin/master' 2021-03-01 11:58:59 -05:00
Anuken
8f91576f85 Fixed script loading for Turkish locale 2021-03-01 11:58:53 -05:00
Patrick 'Quezler' Mounier
4019c49fff Log who skipped the wave to the console (#4825) 2021-03-01 09:47:23 -05:00
Anuken
5f83c92829 Fixed #4824 / Fixed #4827 / Fixed #4829 2021-03-01 09:45:40 -05:00
Anuken
4c9cda7e40 Cleanup 2021-02-28 17:33:08 -05:00
Sunny Kim
01f7b1c9a6 New overdrive visuals for colorblind users (#4807) 2021-02-28 17:32:28 -05:00
Anuken
1a30edc55f Merge remote-tracking branch 'origin/master' 2021-02-28 17:17:08 -05:00
Anuken
49bccffd7c Link previews for power blocks near nodes 2021-02-28 17:17:03 -05:00
Patrick 'Quezler' Mounier
526157a514 Draw to-be affected blocks when placing projectors (#4818) 2021-02-28 13:58:06 -05:00
FiliusPatris
d025ba63e1 Display map names with underscores (#4819)
This makes it obvious how to specify map names with spaces. It also
allows for copy-pasting form the output of `maps`.
2021-02-28 13:27:47 -05:00
genNAowl
662515ce2e Make RepairPoints implement Ranged (#4813)
Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
2021-02-28 09:19:35 -05:00
Joshua Fan
c55ff4ad5e Desktop double-click mining: fix click on mined tile to cancel (#4815) 2021-02-28 09:19:27 -05:00
Anuken
666c0f3582 Merge remote-tracking branch 'origin/master' 2021-02-27 15:10:39 -05:00
Anuken
0c00760ae0 Fixed result duplication in logic UI 2021-02-27 15:10:34 -05:00
Patrick 'Quezler' Mounier
2146b35e5a eacho ther (#4810)
* eacho ther

* Update Tile.java
2021-02-27 10:21:11 -05:00
Anuken
44d10a355e Improved power node link preview check 2021-02-27 10:16:54 -05:00
buthed010203
5037c4e00e Fix a few issues w/ double tap mining (#4798)
Currently, double tap mining consumes clicks so it prevents the player from configuring any block if they click twice within 500ms. The double tap mining was also using the `selected` var which could have been null causing a crash. This is a very messy solution but it does the job good enough
2021-02-27 10:12:00 -05:00
buthed010203
e4ecfc4ee7 Fixed #4791 since it is 100% a bug (#4801)
* Fixed #4719 since it is 100% a bug

This fix is somewhat janky as it checks if the rotation matches the exact original rotation but the likelihood of someone needing bridges along a belt rotated 1 or -1 times is super low. https://aethex.is-a.fail/t13ETd.webm

* unjank rotation

* fix potential crash, styling

* Use mathf.mod
2021-02-26 19:06:27 -05:00
Anuken
ae6be1db3b UnitSpawnAbility 'type' field JSON compat / Fixed health bar out of bounds 2021-02-26 18:51:14 -05:00
Anuken
d06eee99ba Merge remote-tracking branch 'origin/master' 2021-02-26 13:13:41 -05:00
Anuken
8349c8a5b8 Fixed #4802 2021-02-26 13:13:37 -05:00
Darkness6030
2df7484649 Add servers to global list (#4761)
* Add servers to global list
2021-02-26 11:13:51 -05:00
Anuken
1bb97cae39 Fixed #4792 2021-02-25 18:34:24 -05:00
Anuken
f5ac3ff7b0 null controller for dead units 2021-02-25 10:54:05 -05:00
Anuken
f6eba3edae Synchronized settings / Dead units sense as non-controlled 2021-02-25 09:12:17 -05:00
Joshua Fan
781410ea04 Double-tap to mine, tap anywhere to cancel (#4469)
* Double-tap to mine, tap anywhere to cancel

* Make comment consistent

* Remove desktop left-click mining cancel, prioritize mobile unit control over mining

* Mobile: double-tap doesn't configure blocks if unit was double-tapped; control unit detected in first tap of double-tap

* Add 'double-tap to mine' setting (default off)

* Desktop: cancel mining when mined tile is clicked

* Comment typo

* Prevent redundant condition check

* Cleanup

Co-authored-by: Anuken <arnukren@gmail.com>
2021-02-25 08:43:40 -05:00
Anuken
c0d9712beb Fixed #4784 2021-02-25 08:39:35 -05:00
Anuken
0672878920 Fixed #4781 2021-02-24 15:27:22 -05:00
Anuken
b0cdac59f0 Merge remote-tracking branch 'origin/master' 2021-02-24 15:01:48 -05:00
Anuken
4b6a83dd82 Improved auto-bridging with conveyors 2021-02-24 15:01:44 -05:00
Minxyzgo
25ae7b97aa schematic uses camera position (#4775)
* Update InputHandler.java

* Update InputHandler.java

* Update MobileInput.java

* Update InputHandler.java

* Update MobileInput.java
2021-02-24 12:25:38 -05:00
Anuken
afbde49fa2 Fixed #4776 / Fixed #4772 2021-02-24 09:52:53 -05:00
Anuken
befda9baaa Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-02-23 17:07:45 -05:00
Anuken
502c7eb388 arc 2021-02-23 17:07:40 -05:00
Antsiferov Andrew
ad2a18f929 Fix player.locale to be default (#4768)
* fix player.locale == default

* Update NetClient.java
2021-02-23 14:53:23 -05:00
Anuken
830eb86a0f Better power node linking visualization 2021-02-23 12:53:43 -05:00
Anuken
e5413cebdc Fixed #4766 2021-02-23 11:29:51 -05:00
Anuken
1a75951840 Merge remote-tracking branch 'origin/master' 2021-02-23 10:47:58 -05:00
Anuken
08e36aca98 Crafter progress modulo / Segment buff 2021-02-23 10:47:54 -05:00
Patrick 'Quezler' Mounier
aabbfd624a Add disarmed status effect that disarms (#4762)
* Add disarmed status effect that disarms

* Update core/src/mindustry/entities/comp/StatusComp.java

Co-authored-by: Anuken <arnukren@gmail.com>

* Rename disarms -> disarm

Co-authored-by: Anuken <arnukren@gmail.com>
2021-02-23 09:51:43 -05:00
Anuken
2f836d779a Update servers_v6.json 2021-02-22 10:22:28 -05:00
Anuken
d7f848f8cd contXXXXX constants -> ctrl 2021-02-22 10:18:42 -05:00
Anuken
6f7f980563 Merge remote-tracking branch 'origin/master' 2021-02-22 10:15:43 -05:00
Anuken
e2515fc4bf Automatic conveyor/conduit bridging 2021-02-22 10:15:40 -05:00
UnCaughT
d06a7bb7a2 Update servers_v6.json (#4756)
The server now has a new domain.
2021-02-22 10:09:55 -05:00
Sharlotte
dbdfdac94b translated yesterday update (#4755)
* translated newest bundle updates
* ps. why did i forgot 1ef7ae7079 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c) this commit previous translation update?
2021-02-22 09:19:46 -05:00
Anuken
3b2a0cfd66 Removed RCR due to lack of moderation 2021-02-22 09:05:27 -05:00
Anuken
5b652ae51f Added guidelines for inappropriate server content 2021-02-22 09:04:22 -05:00
Anuken
9e8a2b8296 Minor bridge linking fix 2021-02-21 20:07:20 -05:00
Anuken
e6787c5146 Controlled sensor improvements 2021-02-21 12:28:00 -05:00
Anuken
d8552915f7 Cleanup 2021-02-21 10:35:33 -05:00
Anuken
61d9dea487 Logic config replication / logicUnitBuild rule / Copy-able ConstructBlocks 2021-02-21 10:23:46 -05:00
Anuken
02d8f679b5 Merge remote-tracking branch 'origin/master' 2021-02-21 09:22:05 -05:00
Anuken
544828d9fb Logic controller & dead`` sensors 2021-02-21 09:22:02 -05:00
liuxilu
ca726d579e unit boosting sensor (#4738) 2021-02-21 09:20:36 -05:00
Anuken
8257fb5e11 Merge remote-tracking branch 'origin/master' 2021-02-21 08:54:10 -05:00
Anuken
0d287e6d59 Water Extractor: Use metaglass to be consistent with pumps 2021-02-21 08:53:47 -05:00
Patrick 'Quezler' Mounier
4d9dc66a96 Remove stray spaces from accelerator (#4465) 2021-02-20 12:52:56 -05:00
Patrick 'Quezler' Mounier
868d4e05f7 Move update function of resupply point 5x1 spaces back (#4746) 2021-02-20 12:51:12 -05:00
Anuken
a3bf39d86b Minor cleanup 2021-02-20 10:08:15 -05:00
Sharlotte
d76795e0ae translated recent update (#4742) 2021-02-20 10:07:29 -05:00
Ngọc Lam
a2e075ee54 Update Vietnamese Translation. (#4660)
* Update translation, fix some typo

* About 150 lines to do left.

* Typos fix #_1

* Typos fix + add trans

* Update to lastest commit.

* Base logic translation.

* a lot of typo ...

* some update from main bundle.

* Add more logic hint.
2021-02-20 10:07:19 -05:00
Anuken
2df2a0971a arc 2021-02-20 09:49:49 -05:00
Anuken
158e23bd5e Steam icon changes 2021-02-19 19:43:37 -05:00
Anuken
467402ef73 Various fixes 2021-02-19 19:20:04 -05:00
Anuken
f78719afc0 Fixed mod crash disable setting name 2021-02-19 19:10:27 -05:00
Antsiferov Andrew
e6513702d6 [Bundle][RU] actual L10n (#4726)
* 3 new, 1 deleted

New:
rules.unitcapvariable
rules.unitcap
laccess.color

Deleted:
lenum.color

* 1 line changed

rules.unitcap

Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
2021-02-19 18:33:43 -05:00
Arnyyx
aeddf7014c Update bundle_vi.properties (#4724) 2021-02-19 18:32:52 -05:00
Catchears
1613f49c16 german translation for build 125, full android translation (#4703)
* update german translation to 631e4d9eef

* update android translation to e816f6110d

with regard to 5ec5f1aa93

* improve translation with ideas from others

* update german steam discription to e86a3e9d09

* update german translation to 1ef7ae7079 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c)

* changes from stuffyAI

* cross-platform as suggested by stuffyAI

* stuffyAI

genau, hast recht

Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>

Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>
2021-02-19 18:32:44 -05:00
彭瑞暄
57a833c2fb Update Logic Draw Hints (#4734)
Wrapped up some previous logic hints, too.
2021-02-19 18:32:32 -05:00
BlueThecno
6de53343a4 Fixing typos and descriptions [bundle_es.properties] (#4727)
* Fixing and descriptions [bundle_es.properties]

* Forgot something
2021-02-19 18:32:17 -05:00
YellOw139
7bb4b09308 [Bundle][RO] Update (#4725)
* [Bundle][RO] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit 1ef7ae7079
- Typo fixes & various other improvements

* Reducing confusion

* Update bundle_ro.properties
2021-02-19 18:32:07 -05:00
Anuken
68020fa7d4 Fixed "fix" in #4397 2021-02-19 18:31:34 -05:00
Phinner
b94aba0301 Fixing remaining typos\errors in bundle_fr (#4397)
* Fixing remaining typos errors in bundle_fr

There are some errors that had managed to get through the verification. Imma chase them down!

* added logic hints and some typo fixes

* Fixing 2 typos in bundle.properties

L1548: Color statement affects every following draw operations.

* smolfixes
2021-02-19 18:30:49 -05:00
Anuken
0316009a9c Balance tweaks 2021-02-19 18:28:51 -05:00
Anuken
820f7f0ef2 arc 2021-02-19 17:25:37 -05:00
Anuken
6d105ad3e7 Merge remote-tracking branch 'origin/master' 2021-02-19 17:18:23 -05:00
Anuken
f043a5f340 Logic tooltips on mobile devices w/ long-press 2021-02-19 17:18:17 -05:00
CxZxRainzz
73d6f95d2e Update servers_v6.json (#4735)
add 1 more server for CxZx
2021-02-19 17:11:51 -05:00
Fatonndev
fb48070388 Add Survival and PvP servers (#4736) 2021-02-19 17:04:48 -05:00
Anuken
fa7697fc40 Better JSON null validation / Disable mods on startup crash 2021-02-19 13:28:31 -05:00
Anuken
b46a5c0bda Allow JSON mod content types from other class loaders 2021-02-19 09:45:51 -05:00
Anuken
1072c310ad Fixed #4732 2021-02-19 09:04:13 -05:00
Anuken
d5448b59a2 Fixed UnitReq parsing 2021-02-18 21:07:48 -05:00
Anuken
78317e6126 Uncap content names in resolution 2021-02-18 20:15:46 -05:00
Anuken
5a58f9c71a Fixed #4729 2021-02-18 17:00:23 -05:00
Anuken
06b8dd61c7 Better splash damage handling for small radii 2021-02-18 15:02:09 -05:00
Anuken
a81b5778a0 Merge remote-tracking branch 'origin/master' 2021-02-18 13:11:37 -05:00
Anuken
a7188c4884 Content parser class discovery improvements 2021-02-18 13:11:20 -05:00
buthed010203
0bf0d48a02 Make status colors the same (#4719)
It bothers me ok
2021-02-18 10:24:52 -05:00
buthed010203
dc5cd196ed Use github build status (#4718)
Why does this still use travis? It was ditched months ago
2021-02-17 19:44:04 -05:00
Anuken
f8f9bf228b Merge remote-tracking branch 'origin/master' 2021-02-17 17:12:36 -05:00
Anuken
d0dc1ea132 Fixed #4715 2021-02-17 17:12:32 -05:00
RebornTrack970
ff9fad6a2c One last server for the Omega (#4714)
* One last server for the Omega

Added the Annexation server from the OmegaHub to the list as it is the final server people actualy play on.

* Update servers_v6.json

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
2021-02-17 11:05:16 -05:00
Anuken
76dbdb59ce Draw cells for unit payloads 2021-02-17 11:02:49 -05:00
Anuken
0013402962 Merge remote-tracking branch 'origin/master' 2021-02-17 09:49:08 -05:00
Anuken
1ef7ae7079 Logic hints for draw operations 2021-02-17 09:49:01 -05:00
buthed010203
07a39d0da8 V6 servers arent BE last i checked (#4713)
This has been bothering me the last few days and i assumed someone else would fix it and i wouldnt have to make a pr for something so tiny but here i am
2021-02-17 09:36:31 -05:00
Anuken
b8bfb30c56 Merge remote-tracking branch 'origin/master' 2021-02-17 09:15:21 -05:00
Anuken
00342ddaae Misc cleanup 2021-02-17 09:15:17 -05:00
Sharlotte
fb40c0b9de cursed typo (#4705)
cursed typocursed typocursed typocursed typocursed typocursed typocursed typocursed typo
2021-02-17 09:12:49 -05:00
Patrick 'Quezler' Mounier
5d9506eb12 Reshuffle nydus servers (#4708) 2021-02-17 09:12:20 -05:00
Anuken
080fe8c3c4 Decreased impact reactor explosion radius 2021-02-16 15:54:20 -05:00
Anuken
48745d7380 Steam crash fix 2021-02-16 13:40:34 -05:00
YellOw139
41b50d67af [Bundle][RO] Update (#4696)
This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit 631e4d9eef
- Typo fixes & various other improvements
2021-02-16 13:12:29 -05:00
Vanguard
b65dffca9d 4 new, 1 changed (#4688)
New:
enablebuilding
stat.armor
setting.logichints.name
(newline between radar.output and unitradar.target)

Changed:
lenum.turret
2021-02-16 13:12:17 -05:00
Sharlotte
66bdfcf877 [KO] Update bundles again (#4695)
*translated updated new logic hint
*translated new rule
*typo
2021-02-16 13:12:06 -05:00
Anuken
b0082c92c5 Fixed green line bug - Removed stencil+depth buffers 2021-02-16 13:02:15 -05:00
Anuken
fdd1c01ac3 Merge remote-tracking branch 'origin/master' 2021-02-16 12:20:37 -05:00
Anuken
1ffdd9fd99 Fixed #4701 2021-02-16 12:20:30 -05:00
Patrick 'Quezler' Mounier
f64ad2db9f Remove another dead server (#4699) 2021-02-16 11:46:51 -05:00
Anuken
7bfe9bf914 Merge remote-tracking branch 'origin/master' 2021-02-16 10:57:32 -05:00
Anuken
214f3bb9b5 Improved data file zipping 2021-02-16 10:57:20 -05:00
키에르
3f51149883 Remove dead server (#4669) 2021-02-16 09:50:52 -05:00
Anuken
2c368953f9 Merge remote-tracking branch 'origin/master' 2021-02-16 09:13:49 -05:00
Anuken
9d5454e5ce Fixed #4694 2021-02-16 09:13:44 -05:00
TranquillyUnpleasant
631e4d9eef Unit cap (#4689)
* Add unit caps as a map setting.

* Use int and add maximum and minimum handling.

* Put a lower limit of 0 for unit cap
2021-02-15 20:15:56 -05:00
Anuken
957583071d Splash damage tweaks 2021-02-15 18:42:24 -05:00
Anuken
c942331117 New splash damage algorithm 2021-02-15 18:00:47 -05:00
Anuken
710a55dc2d Reverted pixmap blending rename 2021-02-15 11:08:56 -05:00
Anuken
4bbb4b9a19 Reorder NaN check 2021-02-15 11:00:49 -05:00
彭瑞暄
a2e5dae27f Updated zh-TW translations of Logic Hints (#4666)
* Logic Hint pt.1

Some Logic Hints and minor tweaks in previous translations

* Logic Hints pt.2

* Logic Hints pt. 3/3
2021-02-15 10:46:19 -05:00
YellOw139
d5645b8a7b [Bundle][RO] Update (#4631)
* [Bundle][RO][124.1] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:
- New strings/changes up to commit 64acd6c1e4
- Fixed ancient mod-related bundles not fitting the new install button
- Typo fixes & various other improvements

* Logic tooltips - initial English commit

* Block flags

* Romanian logic hints

* polishing

* Since when is this missing

* Polishing
2021-02-15 10:43:34 -05:00
Sharlotte
a9f9946a39 [KO] TYPO (#4665)
* [KO] i got typo!

* typo
2021-02-15 10:42:28 -05:00
Antsiferov Andrew
561deacce4 [Bundle][RU] Logic Popups L10n (#4677)
* Logic popups

* Block flag documentation

* Распознование -> Распознавание (@Prosta4okua)

* Сбрсывание -> Сбрасывание (@XEN0PHIL)

* нахдиться -> находиться (@XEN0PHIL)

* распознования -> распознавания (@XEN0PHIL)

* распознования -> распознавания (@XEN0PHIL)

* распозновать -> распознавать (@XEN0PHIL)

* распознования -> распознавания (@XEN0PHIL)

* Включен -> Включён (@XEN0PHIL)

* - -> - (@XEN0PHIL)

* lst.unitradar (@XEN0PHIL)

* единиц -> единицы (@XEN0PHIL)
2021-02-15 10:42:01 -05:00
Joshua Fan
e528e35e06 Add sector icon picker back button (#4682) 2021-02-15 10:41:56 -05:00
Anuken
af39d6a6ee Fixed #4685 2021-02-15 10:37:24 -05:00
Patrick 'Quezler' Mounier
7a21c02476 Makes the top sprite visible on liquid turret icons (#4683)
* Add top region to liquid turret icons

* Attempt to change outline icon generation

* Draw regions above the outlined icon over it

* Draw regions **above** the outlined icon over it

* Add clarrifying comment

* Implement backwards compatibility for mods

* an -> any
2021-02-15 09:32:46 -05:00
Patrick 'Quezler' Mounier
557e5710cd Fixes BuilderAI & RepairAI retreat nullpointers (#4681)
* Update BuilderAI.java

* Update RepairAI.java
2021-02-15 09:31:27 -05:00
Anuken
fa52255d04 Fixed #4680 2021-02-15 09:30:57 -05:00
Anuken
e16622afcc Automatic retreat AI for builders/repair units 2021-02-14 20:44:40 -05:00
Anuken
f2468f0b3d Cleanup of #4678 2021-02-14 19:14:02 -05:00
Anuken
30c9231df6 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-02-14 19:02:55 -05:00
Joshua Fan
7532aadaf8 Add enable building hint, combine building and respawn hints (#4678) 2021-02-14 19:02:28 -05:00
Anuken
3d226246b9 Labyrinth core fix 2021-02-14 09:15:12 -05:00
Skin
d6c852a082 remove-pandorum (#4676)
Good luck!
2021-02-14 08:54:25 -05:00
Anuken
07a27e913c Added UnitBuild transition class 2021-02-14 08:47:53 -05:00
Anuken
092d152bdc Force-link effect classes on iOS 2021-02-13 18:24:22 -05:00
Anuken
8b756d221b Un-broke scripts 2021-02-13 16:28:49 -05:00
Anuken
f33d684dce Merge remote-tracking branch 'origin/master' 2021-02-13 11:56:44 -05:00
Anuken
56e41309b1 Updated global script 2021-02-13 11:56:40 -05:00
RebornTrack970
91b24433b9 Added the 2R2T and Rush server to Omega. (#4667) 2021-02-13 10:37:44 -05:00
Anuken
9050937900 Name cleanup 2021-02-12 19:40:29 -05:00
Anuken
2e6b90d4d5 Serializable -> JsonSerializable 2021-02-12 15:41:28 -05:00
Anuken
146b2589e2 Fixed rare network error 2021-02-12 14:54:10 -05:00
Anuken
abd07e1525 Fixed chat not working while paused 2021-02-12 12:55:31 -05:00
Anuken
541da5c0c9 Block flag documentation & cleanup 2021-02-12 09:09:10 -05:00
Anuken
21f642ad0c Merge remote-tracking branch 'origin/master' 2021-02-12 08:56:44 -05:00
Anuken
0d084d380d Fixed map resize not preserving links 2021-02-12 08:56:40 -05:00
Sharlotte
0fe158d080 [KO] i got typo! (#4662)
* [KO] i got typo!

* typo
2021-02-12 08:42:35 -05:00
Anuken
0cc64c6a8d Fixed #4658 2021-02-12 08:41:36 -05:00
Anuken
cd684996e1 Cleanup & Steam crash fix 2021-02-11 16:31:44 -05:00
Anuken
0350e6bbf4 Validate teams with power links 2021-02-11 12:03:11 -05:00
Anuken
4fe5972d89 Merge remote-tracking branch 'origin/master' 2021-02-11 10:12:17 -05:00
Anuken
27c8efc672 Better targeting range calculation 2021-02-11 10:12:07 -05:00
Catchears
aef0faf79c update german translation to include logic hints (#4654)
* update german bundle to "force projector heat issues"

ea2b57ec4b
ea2b57ec4b

* Gebäude -> Block to prevent confusion
2021-02-11 10:01:03 -05:00
Sharlotte
ea7d1dd91e [KO] UPDATED KO Translation (#4656)
* translated all without logic hint

* typo typo typo typo everywhere typo oh hi typo

* Update logic hint

* typo

* translated changed android description

* android changelog
2021-02-11 09:55:02 -05:00
Anuken
ea2b57ec4b Force projector heat sense 2021-02-10 14:42:30 -05:00
Anuken
949f5eccd7 Damage distance check fix 2021-02-10 09:46:30 -05:00
키에르
e525d89e43 Add missing properties (#4649)
* Add missing properties

* oh no formatting
2021-02-10 09:37:47 -05:00
Patrick 'Quezler' Mounier
6498ce3c4f Remove double indentation of the io server group (#4650) 2021-02-10 09:21:21 -05:00
MEEP of Faith
cbf30c599b If a building and unit are found within the line, target the closer one. (#4646) 2021-02-10 09:16:49 -05:00
Anuken
54c406f83d Cleanup 2021-02-09 18:28:11 -05:00
Anuken
7b2957ab41 More logic tooltips 2021-02-09 15:04:50 -05:00
Anuken
e22fccf5b1 Logic hint tooltips 2021-02-09 14:52:23 -05:00
Anuken
ce8b32f022 Merge remote-tracking branch 'origin/master' 2021-02-09 12:10:22 -05:00
Anuken
0d0aef3dea Logic layout bugfixes 2021-02-09 12:10:15 -05:00
MEEP of Faith
386da22f6e remove space in perShot (#4640) 2021-02-09 09:52:00 -05:00
SachaTending
f76b514892 Update servers_v6.json (#4615)
Add RCR
2021-02-09 09:44:01 -05:00
Anuken
77dc959e4a Merge remote-tracking branch 'origin/master' 2021-02-09 09:35:03 -05:00
Anuken
a99151441c Fixed #4642 / Logic op reorganization 2021-02-09 09:34:58 -05:00
buthed010203
852b0a97fe 60 * 60 > Time.toMinutes (#4634)
It already exists in other places in the code, doesn't make sense to not use it.
2021-02-08 16:49:14 -05:00
Anuken
38843c25fb Merge remote-tracking branch 'origin/master' 2021-02-08 16:44:22 -05:00
Anuken
ce2750ba60 Rail bullet fix 2021-02-08 16:29:41 -05:00
Fatonndev
1d3dbddaef add player.locale (#4633) 2021-02-08 15:26:48 -05:00
Anuken
d8177daada Merge remote-tracking branch 'origin/master' 2021-02-08 14:55:18 -05:00
Anuken
3cbcd779eb Better strict equality implementation 2021-02-08 14:55:14 -05:00
Nexort23
33fc36a2d4 hub minplay.ru (#4600)
* hub minplay.ru
2021-02-08 14:52:11 -05:00
Anuken
c06146110d Better bullet homing (#4630) 2021-02-08 13:03:08 -05:00
Anuken
1802aab683 isNull op / Return null for null block sense/NaNs 2021-02-08 12:48:39 -05:00
Anuken
49fe47f1f8 Comment fix 2021-02-08 12:23:56 -05:00
Anuken
a13c9d0761 Fixed F-Droid build string not updating on deploy 2021-02-08 10:58:05 -05:00
Anuken
3d8479355c Fixed random key 2021-02-08 10:45:08 -05:00
MEEP of Faith
86c702861e Remove NullPointerExeption error (#4624) 2021-02-08 10:44:08 -05:00
CxZxRainzz
47ec13eef4 Update servers_v6.json (#4628)
Add CxZx
2021-02-08 10:39:41 -05:00
Anuken
d8cd0d867c Merge remote-tracking branch 'origin/master' 2021-02-08 10:37:09 -05:00
Anuken
d5ede6b1bb Un-blacklisted arc.net 2021-02-08 10:37:06 -05:00
키에르
fd931564aa Add sources jar (#4612)
* Add sources jar

* Update build.gradle

* Fix classes not found

* :core

* formatting

Co-authored-by: Anuken <arnukren@gmail.com>
2021-02-08 09:59:11 -05:00
Anuken
6b19178a13 Fixed #4620 2021-02-08 09:52:41 -05:00
Anuken
64acd6c1e4 Merge remote-tracking branch 'origin/master' 2021-02-08 09:42:57 -05:00
Anuken
560914bebe Added more unit stats to database 2021-02-08 09:42:49 -05:00
Anuken
2edec90dfb Cleanup 2021-02-08 09:25:46 -05:00
Catchears
10c1305eae update german translation for build 124 (#4618)
* update german translation for build 124

* shorten text to fit on the button without newline
2021-02-07 17:16:56 -05:00
Joshua Fan
852c98f004 "[E] to enable building" hint while building is paused (#3857)
* Show building hints while building is paused

* Add hint: [E] to enable building

* Remove .left()

* Fix build enable hint display inconsistencies when changing build auto-pause setting

* Combine building hint tables

* Fix indentation
2021-02-07 16:58:42 -05:00
Patrick 'Quezler' Mounier
292f771eb1 Draws team regions during schematic placement (#4588)
* Draw team regions during schematic placement

* Fall back to sharded for headless

* Only draw team regions if the schematic is in-world

This seems better than `player != null && req.worldContext` since it wouldn't really result in any visual changes but saves some draw operations.

* This seems cleaner

Although the order of the 1st and 2nd if argument is debatable for performance reasons.
2021-02-07 13:27:09 -05:00
Anuken
1acc771edc 'Fixed' some iOS warnings 2021-02-07 13:08:10 -05:00
Anuken
ee61d0dcfa Cleanup 2021-02-07 13:01:30 -05:00
Anuken
e5f2073de2 Minor unit balance tweaks 2021-02-07 12:49:26 -05:00
Anuken
816be9e9bd Force projector visual cleanup 2021-02-07 12:38:24 -05:00
Sunny Kim
2107af1f0f Force projection disappearing visuals (#4504)
* forceShrink

* forceShrink

* more quicker to tell it apart from a shield down
2021-02-07 12:36:29 -05:00
MEEP of Faith
3bb85b4bda Custom shadow offset (#4472) 2021-02-07 12:34:54 -05:00
YellOw139
e86a3e9d09 [Bundle][RO][Ready-for-Stable] Translation & metadata update + minor fix (#4409)
* #3958 hotfix

* update Romanian Steam desc count

* Create title.txt

* Add files via upload

* Sorter gates

* charge

* Polishing

* More mod browser
2021-02-07 12:33:51 -05:00
Szczepan Zalega
957426c27f Fix some typos in Polish translation (#4411)
* Fix some typos in Polish translation

* Update bundle_pl.properties

(fixup)
2021-02-07 12:33:45 -05:00
Vanguard
8bc90a19d2 [bundle] update bundle_ru.properties (#4477)
* 1 line changed

- noname

* 1 line changed

- hint.placeTurret

* 3 new lines

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

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

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

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

* 5 changed lines; 2 new lines

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

New:
hint.coreIncinerate
hint.coopCampaign

* 2 changed line

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

* 2 changed lines

hint.coreIncinerate
block.interplanetary-accelerator.description

* 3 new line; 1 changed line

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

Changed:
keybinds.mobile

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

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

Changed:
bullet.knockback

Deleted:
bar.limitreached

* Update bundle_ru.properties

падежи

* Update bundle_ru.properties

мелочи

* 1 changed line

stat.ammouse

* 1 new line

none.found

* 6 changed; 1 deleted

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

Deleted:
mod.featured.title

* 2 changed lines

link.bug.description
mod.scripts.disable

* Update achievements.vdf

* Update description.txt

* 1 changed line

item.thorium.description

* 1 new line

rules.coreincinerates

* 1 new line

bar.boost

* 1 new line

max

* Update bundle_ru.properties

* Update bundle_ru.properties

* rip v3.5 maps

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Prosta4ok obnovi repository

* взлЁт

* 3 new lines

mods.browser.sortdate
mods.browser.sortstars
stat.charge

* Update description.txt

* Update description.txt

* 3 changed, 3 new, 1 deleted

Changed:
mods.browser.sortdate
unit.sei.description
unit.risso.description

New:
mods.browser.reinstall
mods.viewcontent
mods.browser

Deleted:
mod.featured.dialog.title

* 1 line changed

mods.github.open
-
"Репо" is not commonly used and "Репозиторий" does not fit in the button

* 1 new line

mod.installed

Co-authored-by: Felix Corvus <remint32@yandex.ru>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
2021-02-07 12:33:18 -05:00
Prosta4okua
668144cf2a [Bundle]Update bundle_uk_UA.properties (#4434)
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
2021-02-07 12:32:57 -05:00
Anuken
c5ed056601 Removed unused fx 2021-02-07 12:12:15 -05:00
Anuken
ea9d415b92 iOS inset rotation fix 2021-02-07 11:43:34 -05:00
Anuken
c181204700 Fixed mod descriptions going off-screen 2021-02-07 10:44:45 -05:00
Anuken
ca78cb1a3f Fixed #4616 2021-02-07 10:21:38 -05:00
Anuken
fdafa0933f Mod browser layout tweaks 2021-02-07 10:04:46 -05:00
Anuken
ae92813169 Merge remote-tracking branch 'origin/master' 2021-02-07 09:50:37 -05:00
Anuken
8a248dc787 Mod browser layout fixes 2021-02-07 09:50:33 -05:00
Leonid Skorospelov
f90f611a6d plastanium-wall-large schematicPriority should also be 10 (#4613)
plastanium-wall has it, makes sense to put for large one as well
2021-02-07 09:14:19 -05:00
Xasmedy
1c0d148607 Removed same if statement. (#4607)
Removed an if statement that was the same of the one up.
2021-02-06 18:13:48 -05:00
Anuken
95c8b7ae60 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-02-06 12:06:03 -05:00
Anuken
25d013b768 Mod browser icon support 2021-02-06 12:05:59 -05:00
Patrick 'Quezler' Mounier
9de8c4d8ac Update servers_be.json (#4602) 2021-02-06 09:09:56 -05:00
Anuken
7e4ffe6a7d Fixed builds failing without Android project 2021-02-06 08:43:15 -05:00
Anuken
b90372a226 Testing bloom on iOS 2021-02-06 08:37:02 -05:00
Anuken
9adbfcac0f Re-added jcenter repo 2021-02-05 14:11:52 -05:00
Anuken
d1eb7743ad Better mod browser horizontal layout 2021-02-05 12:12:08 -05:00
Anuken
fc3352bcb1 Java mod import support / Moved mod browser button 2021-02-05 11:21:27 -05:00
Anuken
9b3360d932 Mod content lists 2021-02-04 21:02:57 -05:00
Anuken
3784bfac77 Allow mod re-import / Save mod repo on import 2021-02-04 19:30:52 -05:00
Anuken
54754cd177 Don't reset processors when links change 2021-02-04 18:19:56 -05:00
Anuken
c48034e420 Merge remote-tracking branch 'origin/master' 2021-02-04 14:12:07 -05:00
Anuken
3299279c89 Removed jcenter repositories 2021-02-04 14:12:03 -05:00
Patrick 'Quezler' Mounier
a6c3ebc467 Save rotation of repair points (#4586) 2021-02-04 10:23:17 -05:00
Anuken
9f510f61c7 Fixed #4584 2021-02-04 09:25:52 -05:00
Anuken
3ae48b8753 Merge remote-tracking branch 'origin/master' 2021-02-03 19:17:14 -05:00
Anuken
f41725b8dc Minimap unit rendering fix 2021-02-03 19:17:07 -05:00
Fatonndev
115df3aedd Add obvilionnetwork.ru Recapture and Attack servers (#4582)
* Add obvilionnetwork.ru Recapture and Attack servers

* Update servers_v6.json

* Update servers_v6.json
2021-02-03 17:04:55 -05:00
buthed010203
3c136ad0ba add transportation group to container and vault (#4499)
this allows for them to be placed over belts so that people no longer have to clear an area around the core when placing vaults around it.
2021-02-02 15:32:52 -05:00
Patrick 'Quezler' Mounier
48ee3d255d Make timescale accessible to logic (#4503) 2021-02-02 15:20:36 -05:00
QmelZ
b05f867800 add rotation to ParticleEffect (#4501)
* add rotation to ParticleEffect

* add offset
2021-02-02 13:14:47 -05:00
Anuken
55b790a0d4 Merge remote-tracking branch 'origin/master' 2021-02-02 13:13:45 -05:00
Anuken
57f6c9dfd9 Mech rebalancing 2021-02-02 13:13:38 -05:00
Nikopol
2f9c95afd0 Moving server to C.A.M.S. (#4497)
NikoCHIO now in C.A.M.S.
2021-02-02 09:22:54 -05:00
彭瑞暄
4fe1457d96 Updated zh-TW translations (#4449)
* Update bundle_zh_TW.properties

mod sorting & charge

* Changed "Charge"

A better translation came to mind
2021-02-01 09:29:03 -05:00
Folker
2589a27cb5 Create FileTreeInitEvent (#4489)
* filetree init event

* actions do your thing
2021-02-01 09:27:24 -05:00
Anuken
8704e14fd7 Fixed #4493 / Fixed #4492 / Fixed #4490 2021-02-01 09:24:39 -05:00
Anuken
2b17dbe390 #4487 but properly implemented 2021-01-31 19:44:29 -05:00
Anuken
919012608a Merge remote-tracking branch 'origin/master' 2021-01-31 16:35:17 -05:00
Anuken
5675a5b035 F 2021-01-31 16:35:13 -05:00
RebornTrack970
6724752980 Added server Omega (#4435)
* Added server Omega

This is the hub of my servers. The other ip for it is: omega.my.to:25906 but that one sometimes doesnt work.

* changed the ip to dns version

* the ip seems more useable

some devices cant seem to connet to dns.

Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-31 15:58:26 -05:00
UnCaughT
0e078a9c60 Update servers_v6.json (#4452)
Русскоязычный сервер с Hex сражениями.
2021-01-31 15:57:08 -05:00
_owler_#0954
c0b1dfc55a closed. (#4481) 2021-01-31 15:52:55 -05:00
Anuken
3d201f7042 Fixed #4474 / Fixed #4475 / Fixed #4476 / Fixed #4483 2021-01-31 15:51:42 -05:00
Anuken
f1a5aae30a Merge remote-tracking branch 'origin/master' 2021-01-29 12:02:36 -05:00
Anuken
9142da2b70 Stop shooting upon crawler death 2021-01-29 12:02:31 -05:00
Vajda Simon
022c76bf45 bundle_hu.properties (#4464)
They spoke on Discord because of an incorrect translation.
2021-01-29 09:40:07 -05:00
Patrick 'Quezler' Mounier
bc6db72df0 Make fillitems fill the core to the brim (#4462)
Instead of just setting all items to the capacity of the first found core.
2021-01-29 09:38:26 -05:00
Anuken
d512aa5b21 Fixed #4463 2021-01-29 09:32:29 -05:00
Anuken
7cdf7a21fe Minor power graph optimizations 2021-01-28 12:07:50 -05:00
Anuken
9a5a6e1ce2 Merge remote-tracking branch 'origin/master' 2021-01-28 10:23:07 -05:00
Anuken
5a258d2830 Fixed #4461 2021-01-28 10:23:02 -05:00
Patrick 'Quezler' Mounier
96ee32f8ed Custom Game Underline 2: Electric Boogaloo (#4457)
* Update CustomGameDialog.java

* Remove .row() for consistensy
2021-01-28 09:06:30 -05:00
Joshua Fan
a667a94c8e Draw plastanium conveyors on conveyors layer (#4446) 2021-01-27 12:08:51 -05:00
Anuken
d0572a2a0d Merge remote-tracking branch 'origin/master' 2021-01-27 11:49:08 -05:00
Anuken
47eea79b60 Fixed #4453 / Fixed #4450 2021-01-27 11:49:04 -05:00
Patrick 'Quezler' Mounier
03b37235b3 producer -> generator (#4441) 2021-01-26 11:35:48 -05:00
Patrick 'Quezler' Mounier
6969fbb1e7 Give tsunami the extinguisher flag as well (#4442) 2021-01-26 11:31:36 -05:00
Anuken
ccc59aa61b Minor wave task tweaks 2021-01-26 10:37:36 -05:00
Anuken
c658865907 Dynamic lightning damage tweaks 2021-01-25 17:21:12 -05:00
Sunny Kim
a13d51e09a Charge stat for Item (#4392)
* Stat.discharge, discharge

* Update Items.java

* item.discharge

* full container = somewhat more than 4 full batteries

* Stat.discharge

* stat.discharge = Discharge

* Update core/src/mindustry/type/Item.java

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* removed dis

* oops

* unit zap

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
2021-01-25 17:10:34 -05:00
Anuken
f827337259 Merge remote-tracking branch 'origin/master' 2021-01-25 16:16:45 -05:00
Anuken
b83c76f728 Improved liquid bridge throughput 2021-01-25 16:16:38 -05:00
Thomas Widyantoko
5666fd4999 new update in_ID translation (#4437)
yes
2021-01-25 14:32:35 -05:00
Anuken
5930e3c350 Cleanup 2021-01-25 12:53:27 -05:00
Anuken
4630e5b3a4 Wave spawning improvements 2021-01-25 10:28:36 -05:00
Anuken
f16990edcb Reconstructors: Accept unit dropped payload when disabled 2021-01-24 20:20:03 -05:00
FrederickDoering
13896589c2 Made disabling payload conveyors output from routers more reliable. (#4433)
Prevented reconstructors from being roughted to when disabled.

Co-authored-by: frederick_efd <frederick.doering@nordson.com>
2021-01-24 20:18:09 -05:00
Anuken
8b5cf5309a Reactive effect flag 2021-01-24 15:22:41 -05:00
Anuken
baedba0d5b Mutual status effect transitions 2021-01-24 14:20:48 -05:00
Anuken
9f926ef71e Merge remote-tracking branch 'origin/master' 2021-01-24 13:08:05 -05:00
Anuken
18a3f8bb68 Fixed #4431 2021-01-24 13:08:01 -05:00
genNAowl
623b7ada11 Let Logic Sense Range (#4425)
Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
2021-01-24 09:23:12 -05:00
_owler_#0954
6b6d52e2fd Add new minigame (#4427)
PvP version of tower defence
2021-01-24 09:22:44 -05:00
MEEP of Faith
fc91b6b135 Colored construct (#4417) 2021-01-23 15:29:36 -05:00
Anuken
f9c33453f2 Merge remote-tracking branch 'origin/master' 2021-01-23 10:33:10 -05:00
Anuken
ad4650f408 Fixed #4420 / Fixed #4418 / Fixed #4416 2021-01-23 10:33:06 -05:00
Joshua Fan
8ca08a0f14 Make schematics build insulated blocks first, power nodes last (#4414)
* Make schematics build insulated blocks first, power nodes last

* Add schematicPriority property to sort by

* Assign schematicPriority of 10 to power diode
2021-01-23 10:28:26 -05:00
Anuken
792fdef95d Minor parse fix 2021-01-21 21:25:04 -05:00
Anuken
457514a2c8 Fixed #4407 2021-01-21 21:21:02 -05:00
Anuken
027d080c55 Fixed #4403 2021-01-21 16:10:16 -05:00
Anuken
bf8f059c25 Merge remote-tracking branch 'origin/master' 2021-01-21 14:45:51 -05:00
Anuken
a73165353f Fixed #4402 2021-01-21 14:45:43 -05:00
Nikopol
613b5a7703 Update servers_v6.json (#4401) 2021-01-21 10:54:24 -05:00
genNAowl
988791f18d Let Logic set (and read) Illuminator Color (#4374)
* illluminator color logic control

* remove sense

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
2021-01-21 09:30:36 -05:00
Patrick 'Quezler' Mounier
1fb608220f Make impact reactor warmup sensable as heat (#4399)
* Make impact reactor warmup sensable as heat

* Update ImpactReactor.java
2021-01-21 09:30:25 -05:00
키에르
56b87a2141 Add kr server (#4378)
* Add kr server

* Update servers_v6.json

Co-authored-by: Blockzilla101 <48705529+Blockzilla101@users.noreply.github.com>

Co-authored-by: Blockzilla101 <48705529+Blockzilla101@users.noreply.github.com>
2021-01-21 09:13:07 -05:00
Anuken
3aee9bddd4 Cleanup 2021-01-21 08:54:14 -05:00
Sunny Kim
65f97edbc5 Add search option for mod browser (#4391)
* add search option

* mods.browser.sortdate

* mods.browser

* Update bundle_ko.properties

* oopsie

* clearPartiali

* half of my brain cells failed to boot
2021-01-21 08:51:43 -05:00
Anuken
d393230add . 2021-01-21 08:50:25 -05:00
Anuken
75d2b0fb69 Fixed #4393 / Fixed #4398 2021-01-21 08:48:36 -05:00
Anuken
0cc9b0b0a3 Mod version parse fix 2021-01-20 16:44:04 -05:00
Anuken
9b6c125233 UI.formatAmount for negative numbers 2021-01-20 16:38:46 -05:00
Anuken
1f2b331bf6 Possible Android mod extension fix 2021-01-20 14:48:54 -05:00
Anuken
ec73426bbc Smaller 1x1 block status indicators 2021-01-20 13:52:14 -05:00
Anuken
770d8506c5 MoveLightning ability bullet support 2021-01-20 12:31:35 -05:00
Anuken
10cd15a088 Merge remote-tracking branch 'origin/master' 2021-01-20 10:51:06 -05:00
Anuken
481e19b1ec Balancing to counteract double-splash-damage bug 2021-01-20 10:51:01 -05:00
彭瑞暄
e326e3a273 Updated zh-TW Steam & Android (#4382)
* removed "never", minor updates

* steam description

* translation moderation

* removed weird syntax

* Update full_description.txt

* Update full_description.txt
2021-01-20 09:22:49 -05:00
rMuchan
d747b1d96a update zh-cn translation (#4244)
* update zh-cn translation

* update zh-cn translation

* add missing item
2021-01-20 09:18:13 -05:00
Anuken
f64cb3ad9a Fixed #4385 2021-01-20 09:11:32 -05:00
Anuken
c4ea5a8256 Merge remote-tracking branch 'origin/master' 2021-01-19 19:55:25 -05:00
Anuken
fa8d43bbc9 Misc cleanup 2021-01-19 19:55:21 -05:00
MEEP of Faith
77f31fd86c Movement Lightning Ability Improvements (#3901)
* Movement Lightning Ability Improvements

* `Core.atlas.find` Might not always be avalable

* Default is null

* Fix
2021-01-19 19:20:25 -05:00
end
18fe2a1737 Update achievements.vdf (#4358) 2021-01-19 18:52:09 -05:00
YellOw139
e816f6110d [Fastlane][RO] Steam Translation (#3958)
* Create short-description.txt

* Add files via upload

* incomplete

* Update achievements.vdf

* finished

* import commit 032 b254

* [Steam] Update counts

Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-19 18:50:49 -05:00
YellOw139
632887ddd2 [Metadata] Android desc = Steam desc (#4370)
Features:
- Kept the first 2 sentences intact. This means that roughly same text is displayed before clicking 'Read more'. 'Features include:' has been dropped for 'Gameplay Features', for Steam similarity.
- Steam-like formatting. I noticed that <h2> doesn't seem to do anything. Despite that, I've seen Gameloft using it. For something bigger, I'd recommend <big>.
- Updated blocks count. There's over 130 blocks. I triple checked.
- The old description still had 4 unique bosses. RIP.
- Steam Workshop & achievements and Android don't mix up.
- Checked against the character limit. It has less than 4000.
- Only cat-approved text.
2021-01-19 18:39:09 -05:00
MEEP of Faith
c53a6a7c04 hitColor colored beam effects. (#3471)
* hitColor colored beam effects.

* Same with lasers

* fix
2021-01-19 17:46:02 -05:00
Nikolass1000
532a4bc140 Update bundle_pl.properties (#4377) 2021-01-19 17:33:42 -05:00
Arnyyx
88086f5ba9 Update bundle_vi.properties (#4333) 2021-01-19 17:32:15 -05:00
Molovtov
0be39d43a2 better_thai_translate.properties (#4314)
* better_thai_translate.properties

Better thai translate but not done yet,by the red(need more blins)

* Better_thai_properties

Better thai by thai people,by the red(need more blins)
2021-01-19 17:30:40 -05:00
rnarko
e9abe273c7 Update Polish translation to fix eye-hurting typos (#4310) 2021-01-19 17:30:30 -05:00
Thomas Widyantoko
775ebd6e94 more in_ID translation (#4286)
* more in_ID translation

fixes, addition, etc

* changes to in_ID

translated rules.coreincinerates and removed waves.never to match up with the original bundle file
2021-01-19 17:24:03 -05:00
Esculap
b86201ea9b Update bundle_pl.properties (#4326)
Translated some tiles (not translated yet):
Dacite => Dacyt
Dacite Wall => Dacytowa Ściana
Dacite Boulder => Dacytowy Głaz
Stone Wall => Kamienna Ściana
Ice Wall => Lodowa Ściana
Snow Wall => Śnieżna Ściana
Dune Wall => Wydmowa Ściana
Dirt => Ziemia
Dirt Wall => Ziemna Ściana
Mud => Błoto
Basalt => Bazalt
2021-01-19 17:23:44 -05:00
彭瑞暄
e3ccde31d8 removed "never", minor updates (#4363) 2021-01-19 17:21:41 -05:00
Vajda Simon
32d1d7264c bundle_hu.properties (#4181)
Okay, so a lot of little ones go big.
2021-01-19 17:08:22 -05:00
Sharlotte
27d9718d4f update KO bundle + android (#4285)
* Update bundle_ko.properties

* oops!

* changelog update

* Update full_description.txt

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

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

* Fix

* Facepalm

* Code Fix

* Texture Fix
2021-01-19 15:42:33 -05:00
机械师
52e47a28c4 Update servers_v6.json (#4132)
增加两个中国地区服务器,主要为挑战性地图。
Add two China region servers, mainly for challenging maps.
2021-01-19 15:36:27 -05:00
Petr Gašparík
b9b8fc66b1 Czech translation - ongoing effort (#3841) 2021-01-19 15:28:23 -05:00
YellOw139
c026d44cd3 [Bundle][RO] Translation update (#4192)
* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- ~~New strings/changes up to commit~~ TBA
- Sector description improvements
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Max

* repeated typo typo typo

* Welcome to 2020 when maps are no longer images

* <never> forget your position in the 20s
2021-01-19 15:26:36 -05:00
CPXMC
eb75cd5ae8 Update contributors (#3766)
Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-19 15:26:12 -05:00
Antsiferov Andrew
7e10487926 [Bundle][RU] actual L10n (#4173)
* 1 line changed

- noname

* 1 line changed

- hint.placeTurret

* 3 new lines

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

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

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

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

* 5 changed lines; 2 new lines

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

New:
hint.coreIncinerate
hint.coopCampaign

* 2 changed line

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

* 2 changed lines

hint.coreIncinerate
block.interplanetary-accelerator.description

* 3 new line; 1 changed line

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

Changed:
keybinds.mobile

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

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

Changed:
bullet.knockback

Deleted:
bar.limitreached

* Update bundle_ru.properties

падежи

* Update bundle_ru.properties

мелочи

* 1 changed line

stat.ammouse

* 1 new line

none.found

* 6 changed; 1 deleted

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

Deleted:
mod.featured.title

* 2 changed lines

link.bug.description
mod.scripts.disable

* Update achievements.vdf

* Update description.txt

* 1 changed line

item.thorium.description

* 1 new line

rules.coreincinerates

* 1 new line

bar.boost

* 1 new line

max

* Update bundle_ru.properties

* Update bundle_ru.properties

* rip v3.5 maps

* Update bundle_ru.properties

* Update bundle_ru.properties

Co-authored-by: Felix Corvus <remint32@yandex.ru>
Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
2021-01-19 15:24:59 -05:00
ZirKNkium611
ae921bf266 Update bundle_es.properties (#4027)
* Update bundle_es.properties

correcting and improving some translations

* Update bundle_es.properties

correcting team names
2021-01-19 15:22:47 -05:00
Phinner
ca62d2aa07 Rework and Update of the french bundles (Steam and bundle_fr) (#4350)
* Complete rework of bundle_fr

# Complete rework of bundle_fr
## Overview
Hello players. I made a pull in [Mindustry-Suggestions](https://github.com/Anuken/Mindustry-Suggestions/issues/1743) about merging bundle_fr and bundle_fr_be. The cat told he was unable to do that because:
> I don't understand either language, so I would be unable to merge the two bundles with any degree of accuracy. This is best discussed and implemented by other speakers of the language(s).
So I decided to do that with the help of senri on discord and Voila. There is the updated version of the french bundle for Belgians, Frenchs, Quebecois and everyone else who speaks or learns french !
## Changes
There are the words I changed that you may argue about:
```
FPS -> IPS
Raccourci clavier -> Touches
Foreshadow -> Présage
Mace -> Titan
Scepter -> Destructeur
Reign -> Eradicateur
Lancier -> Perforateur (Its just an idea)
Chat -> Tchat
Minuterie -> Compte à rebours (Makes more sense for the waves i think)
Minimap -> Mini-carte
Supporté -> Pas pris en charge (For errors, makes more sense)
Hébergeur -> Hôte (the shorter the better)
Foreuse à vérin -> foreuse pneumatique (I don't think being super precise might help normal players)
Onde -> Vague
Percussion -> Percuteur (C'est un nom qui percute !)
- Deleted the (e) until the file is reviewed by more people
- Made the whole file more coherent, I mean there were upper/lower case letters where it shouldn't be.
- Added translations for V6 content like logic blocks, sector description, turrets, units...
- Some more stuff I may have forgotten
```
## Lines to verify in priority
There are the lines I was strugulling with
```
16, 23, 27, 37, 100, 109, 128, 129, 140, 153, 159, 189, 204, 229, 251, 282, 291, 321, 341, 421, 468, 482, 515, 536, [598 -> 613], 703, 705, 715, 751, 777, 1254, 1402
```
## conclusion
Like I said, I merged fr and fr_be, taking the best translations one by one and translating the missing lines. That would be cool if you look quickly in the file and find some errors I could have made. Thank you for reading and I wish you a good day, or night...

* Hotfix

* Updated steam translations

Updated the achievements and Added the new ones. The only problem I had is the "NEW_ACHIEVEMENT_26_1_DESC", I think there's better translation for that but I'm unable to figure it out for some reasons.

Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-19 15:18:38 -05:00
Anuken
2ba093c640 Merge remote-tracking branch 'origin/master' 2021-01-19 15:13:46 -05:00
Anuken
e3f388692f Misc cleanup & fixes 2021-01-19 15:13:41 -05:00
Loumardes
4fc805abbf launch core translated to "Lancement du noyau" (#4348) 2021-01-19 14:38:18 -05:00
Loumardes
cd81482b6b untranslated mods notification strings (#4347) 2021-01-19 14:38:11 -05:00
itcannotbe
3972e34dde Update bundle.properties (#4375)
Remove flowgate limitation in block description.
2021-01-19 14:37:40 -05:00
Rodrigo
01b24959c8 Typo (#3947)
Í
2021-01-19 13:53:56 -05:00
Anuken
40908589b9 Merge remote-tracking branch 'origin/master' 2021-01-19 10:46:38 -05:00
Anuken
774be56bde #4379 2021-01-19 10:46:33 -05:00
Rodrigo
68f19fdbcf Update bundle_pt_BR.properties (#4352)
Fixed a dumb error
2021-01-19 10:22:11 -05:00
reNemesic
50aab01a2e Perfecting of bundle_pt-BR [Finished] (#3863)
* Update bundle_pt_BR.properties

Added sector description [not finished]

* Update 2

Finished first translation of sector descriptions (fixes and did the last one)
Added some translations for not done entries.

* Upgrade #3

Started fixing consistency issues
Redid sector descriptions
Translated last untranslated elements

Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-19 10:21:34 -05:00
RayanZ22
ead0158ef9 Update bundle_pt_BR.properties (#3612)
update
2021-01-19 10:17:08 -05:00
Anuken
d06a74e7a2 Fixed #4376 2021-01-19 09:58:41 -05:00
Anuken
8fab335b9d Merge remote-tracking branch 'origin/master' 2021-01-18 20:18:03 -05:00
Anuken
25b22b4f93 Duplicate IP prevention / Removed overflow inventories 2021-01-18 20:17:59 -05:00
alex
0061690631 Update servers_v6.json (#4342)
Adding a fast paced hex for V6.
2021-01-18 19:50:40 -05:00
Joshua Fan
26ad53ec50 Tweak highlight on plastanium sprite (#4373) 2021-01-18 19:42:47 -05:00
Anuken
4aa2d9097f Merge remote-tracking branch 'origin/master' 2021-01-18 18:04:21 -05:00
Anuken
82f8e78ec8 Fixed various rounding errors in database 2021-01-18 18:04:16 -05:00
Sunny Kim
f91910e84f conductsTo() returning whether to conduct itself to adjacent builds (#4354)
* conductsTo

* insulated block no longer conducts

* moved both checks to be symmetrical
2021-01-18 17:45:45 -05:00
Joshua Fan
2da128678a Always allow zoom while controlling unit that can't build (#4371) 2021-01-18 17:44:01 -05:00
genNAowl
18a382b07a Draw Conveyor Items under Blocks (#4372)
* Draw Conveyor Items under Blocks

* Remove new layer in favor of subtraction

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
2021-01-18 17:34:17 -05:00
Anuken
83a4f56679 Fixed #4368 2021-01-18 17:23:16 -05:00
Anuken
ffad9cb9a9 Merge remote-tracking branch 'origin/master' 2021-01-17 15:54:49 -05:00
Anuken
6a63956b71 Anuken/Mindustry-Suggestions/issues/1808 / Less fire in rain 2021-01-17 15:54:43 -05:00
Patrick 'Quezler' Mounier
32a1d91faf Use Player.deathDelay + 1 instead of magic number (#4344) 2021-01-17 15:33:19 -05:00
Anuken
634d9d1a40 Fixed #4357 / Fixed #4349 / Fixed #4345 / Fixed #4343 2021-01-17 15:31:22 -05:00
Anuken
f9adcfeed1 Ground units: Avoid stepping onto dangerous/deep floor 2021-01-17 09:21:11 -05:00
Anuken
02ef633529 Removed redundant parens 2021-01-15 17:10:38 -05:00
Patrick 'Quezler' Mounier
f3b1ef02e3 Scale impact reactor warmup time with boost (#4317) 2021-01-15 17:09:39 -05:00
Anuken
2d3a9b605a Fixed #4337 / Fixed #4336 2021-01-15 17:09:12 -05:00
Anuken
718a40d742 More pattern matching 2021-01-15 16:04:26 -05:00
Anuken
650d47991e Formatting 2021-01-15 12:43:37 -05:00
Anuken
6ec76409ef Fixed #4335 2021-01-15 12:38:42 -05:00
Anuken
136c8cfcd2 Cleanup + Generic cross rendering 2021-01-15 11:34:33 -05:00
Anuken
bceb7b5809 Merge remote-tracking branch 'origin/master' 2021-01-15 11:16:12 -05:00
Anuken
a342a7d638 Cleanup & bugfixes 2021-01-15 11:16:08 -05:00
MEEP of Faith
956f4659c7 Sound stuff (#4332) 2021-01-15 10:13:41 -05:00
Anuken
593a7b060c Fixed #4334 2021-01-15 10:04:56 -05:00
Anuken
81ce3a28a1 More distinct plastanium sprite 2021-01-14 13:46:27 -05:00
Anuken
32070a37f7 Fixed #4325 2021-01-14 11:26:16 -05:00
Anuken
95c04eb085 Minor sector damage calculation changes 2021-01-13 17:09:18 -05:00
Anuken
c2602fe6a0 Fixed #4319 2021-01-13 10:43:04 -05:00
Anuken
9ce5164a7e Merge remote-tracking branch 'origin/master' 2021-01-12 11:53:04 -05:00
Anuken
ee79bc5501 Replaced waves.never with ∞ 2021-01-12 11:52:51 -05:00
彭瑞暄
3dc70be516 Update zh-TW translations (#4290)
* Update zh-TW bundle, surge correction

Changed surge ammo characteristic "shock".
Thought "shock" as in only stunning or making the enemy flinch.
It means shocking the enemy with electricity and deal bonus damage when the unit is covered in water.

* Launch max UI

* Minor correction wave spawning
2021-01-12 11:25:41 -05:00
Anuken
e44c3899e8 Merge remote-tracking branch 'origin/master' 2021-01-12 10:19:36 -05:00
Anuken
e7885a405e Removed 3.5 map image message
Reasoning: 3.5 images and most other map images won't work in the editor. If you try to import a random image, it will give you an empty map. Only maps that were exported as images previously will work correctly.
2021-01-12 10:19:30 -05:00
MEEP of Faith
c6b60a2620 shootLength for other turrets that aren't PointDefenceTurrets (#4312) 2021-01-12 09:39:27 -05:00
Anuken
9b6c44757a Merge remote-tracking branch 'origin/master' 2021-01-11 16:07:55 -05:00
Anuken
0cbc4c0cc5 Fixed #4311 2021-01-11 16:07:46 -05:00
Patrick 'Quezler' Mounier
e83cfe6cab Display unit cap modifier for core blocks (#4163)
* Display unit cap modifier for core blocks

* Move maxUnits stat from crafting to general

* Omit string formatting
2021-01-11 14:30:58 -05:00
Anuken
912ea94828 Merge remote-tracking branch 'origin/master' 2021-01-11 10:14:28 -05:00
Anuken
6417073a82 Corrected parallax target check 2021-01-11 10:14:23 -05:00
BlueWolf
994194452d fix a comment typo (#4307) 2021-01-11 10:13:28 -05:00
Anuken
c716c16746 Fixed #4305 / Fixed #4309 2021-01-11 10:11:31 -05:00
Anuken
f188563052 Sort mod browser entries by date 2021-01-10 16:59:02 -05:00
Anuken
07e8b4334b Merge remote-tracking branch 'origin/master' 2021-01-10 16:33:27 -05:00
Anuken
c0e955dc1f Updated to Gradle 6.8 2021-01-10 16:33:20 -05:00
Slava0135
2927348a6c power info fixes (#4303)
* power info fixes

* a better solution

* one little detail
2021-01-10 15:46:29 -05:00
Milan
96c8e0f415 add resolveDependencies gradle task (#4302) 2021-01-10 15:39:50 -05:00
Anuken
21f05c9d8a Merge remote-tracking branch 'origin/master' 2021-01-10 15:39:11 -05:00
Anuken
9b1c66ba15 #4298 2021-01-10 15:39:00 -05:00
BlueWolf
8b9b11f77f 1mil source output (#4299) 2021-01-10 15:33:31 -05:00
Anuken
9c846bd2c9 Invasion chance tweaks (#4297) 2021-01-10 15:27:17 -05:00
Anuken
7372bf37c2 Fixed #4301 2021-01-10 15:23:15 -05:00
Anuken
0a5a301573 Save building enabled state 2021-01-09 22:13:41 -05:00
Anuken
462a5b941e Merge remote-tracking branch 'origin/master' 2021-01-09 10:31:52 -05:00
Anuken
21fd20ea5b Targetp support for allied targets 2021-01-09 10:31:44 -05:00
Antsiferov Andrew
a0c7b33ff1 Add ModMeta#toString (#4292) 2021-01-09 10:06:12 -05:00
Anuken
b762a5028b Merge remote-tracking branch 'origin/master' 2021-01-08 12:22:46 -05:00
Anuken
2f83ba7f5c Logic battery control + Slight swarmer range buff 2021-01-08 12:22:32 -05:00
_owler_#0954
01d972f015 Update servers_v6.json (#4194)
* Update servers_v6.json

* Update servers_v6.json

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* Update servers_v6.json

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
2021-01-08 11:21:25 -05:00
alex
0435140bb5 Update servers_v6.json (#4287)
A new game mode to share with the public! Turbo PVP
2021-01-08 09:53:57 -05:00
xzarfs
ff84d788a6 Changes to finnish translation (#4144)
Made existing translations more user friendly and added new translations. There are still big areas the translation is lacking, e.g. the tutorial.
2021-01-07 17:11:06 -05:00
Anuken
4c2f330e51 Merge remote-tracking branch 'origin/master' 2021-01-07 15:18:49 -05:00
Anuken
bd0f47c325 Faster weapon copy 2021-01-07 15:18:44 -05:00
genNAowl
13fbcb9ba8 Launch UI Max Button (#4238)
* max

* Add @Nullable

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
2021-01-07 13:38:31 -05:00
Anuken
9774095df4 Merge remote-tracking branch 'origin/master' 2021-01-07 10:08:33 -05:00
Anuken
f231849a42 UnitCreateEvent / UnitDeployEvent split 2021-01-07 10:08:28 -05:00
Antsiferov Andrew
c7d059a58f Don't terminate socket server on connection reset (#4282) 2021-01-07 09:52:02 -05:00
Anuken
c420ad1a16 Merge remote-tracking branch 'origin/master' 2021-01-06 16:25:09 -05:00
Anuken
99aec4ad15 Fixed #4277 2021-01-06 16:25:05 -05:00
彭瑞暄
1be91961d6 core inc & boost meter (#4272) 2021-01-06 12:15:34 -05:00
Anuken
9f51e23206 Merge remote-tracking branch 'origin/master' 2021-01-05 18:59:51 -05:00
Anuken
ebf4435af4 Fixed #4270 2021-01-05 18:59:46 -05:00
Patrick 'Quezler' Mounier
f4bf8fd998 Add boost bars to overdrive projectors (#4255)
* Add boost bars to overdrive projectors

* Add bar.boost to bundle

* Intelij lied to me
2021-01-05 15:32:43 -05:00
VozDuh
5516435619 Custom Launch Pad Pod Textures (#4203)
* Custom Launch Pad Pod Textures

* Facepalm

* Fix

* Fix

* Fix

Co-authored-by: Anuken <arnukren@gmail.com>

* Fix

Anuke!

Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-05 15:17:18 -05:00
PAP6
5c24254d84 Update servers_v6.json (#4263)
Reason: This server is currently running version 104.10, so it shouldn't be here.
2021-01-05 10:52:21 -05:00
Patrick 'Quezler' Mounier
fdf08ed51d Highlight all linked inventories on core selection (#4256)
* Highlight all linked inventories on core selection

* Loop cores instead of storage blocks
2021-01-05 10:43:36 -05:00
Patrick 'Quezler' Mounier
42fb6ffa0d Add core incineration to custom rules dialog (#4264)
* Update CustomRulesDialog.java

* Update bundle.properties

* Update core/assets/bundles/bundle.properties

Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>

Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>
2021-01-05 10:37:37 -05:00
Anuken
0c4750781a Sound cleanup 2021-01-04 19:50:49 -05:00
Anuken
69eb8faf67 Fixed #4261 / Basic rotation shine effect 2021-01-04 17:22:18 -05:00
Anuken
0ab4f01d5d Better suicide bomb trigger check 2021-01-04 11:20:01 -05:00
Anuken
6361b7e57d Merge remote-tracking branch 'origin/master' 2021-01-04 11:06:19 -05:00
Anuken
961331c832 Minor turret targeting fix 2021-01-04 11:06:11 -05:00
Quick-Korc
8cdb4c0831 Indonesian Gplay Translate (#3708)
* Indonesian Gplay Translate

* Create 29741.txt
2021-01-04 10:56:39 -05:00
彭瑞暄
6bd8f99be3 Updated Search Bar cleanup for zh-TW (#4186)
* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

* Merge down (#16, post 122)

* Fixed #4108

* [QoL] Chat modes (#3869)

Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).

* add new io server (#4109)

soon to be up gamemode

* typo (#4110)

* Fixed mined item flashing on clients

* Block Forge improvements (#4112)

* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot

* Up-to-date zh-TW translations (#4083)

* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>

* Higher power source output

* Update servers_v6.json (#4095)

* Update servers_v6.json

the ip changed to not make users confuse

* Update servers_v6.json

* Fixed #4120

* Fixed #4121

* Fixed #4122

* Better build beam visuals

* Don't render weather in full map screenshots

* Building priority fix

* Fixed #4128

* SearchBar class - add search bars to mods (#3267)

* Create SearchBar and make ModsDialog use it

* add search bar to servers

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* a

* fix mods menu not rowing

* remove search bar for remote servers

* h

* hide searchbar on landscape mobile

* anukes feedback

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Anuken <arnukren@gmail.com>

* java dumb

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>

* Search bar cleanup

* Block (un)loader major improvements (#4127)

* make it consider consVaild

* make this too

* pattern style and max block size

* Is there a better way to do this?

* Update BlockUnloader.java

* do not the /0

* prevent /0

* test 1

* yup it works for enabled

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com>
Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com>
Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com>
Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com>

* "Search bar cleanup" update

* Hope this fixes merge conflict

* Delete servers_v6.json

* pain

* Sync (#21)

* Fixed #4108

* [QoL] Chat modes (#3869)

Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).

* add new io server (#4109)

soon to be up gamemode

* typo (#4110)

* Fixed mined item flashing on clients

* Block Forge improvements (#4112)

* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot

* Up-to-date zh-TW translations (#4083)

* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>

* Higher power source output

* Update servers_v6.json (#4095)

* Update servers_v6.json

the ip changed to not make users confuse

* Update servers_v6.json

* Fixed #4120

* Fixed #4121

* Fixed #4122

* Better build beam visuals

* Don't render weather in full map screenshots

* Building priority fix

* Fixed #4128

* SearchBar class - add search bars to mods (#3267)

* Create SearchBar and make ModsDialog use it

* add search bar to servers

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* a

* fix mods menu not rowing

* remove search bar for remote servers

* h

* hide searchbar on landscape mobile

* anukes feedback

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Anuken <arnukren@gmail.com>

* java dumb

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>

* Search bar cleanup

* Block (un)loader major improvements (#4127)

* make it consider consVaild

* make this too

* pattern style and max block size

* Is there a better way to do this?

* Update BlockUnloader.java

* do not the /0

* prevent /0

* test 1

* yup it works for enabled

* bugfixes, call me the mother of the block forge (#4135)

(anuke is the father)

* Fixed #4141 / Fixed #4136

* Faster power graph reload / Fixed iOS editor margin

* Remove 4 square blocks from the accelerator (#4139)

* Normalize rule comment line endings

Just so i can get a new patch-## branch where i can drag my accelerator sprite on since github isn't smart enough yet to see that as a possible pull request by itself.

* Add files via upload

* Add files via upload

* Use sector preset name for maps if possible

* Fixed #4147

* Update servers_v6.json (#4148)

changed the port number for our attack server.
sorry for the inconvenience, i don't have control over the port number of this "alexmindustryattac.ddns.net" hosted server.

* Removed packed sprite section from CONTRIBUTING.md (#4152)

* Return large launchpad item costs (#4134)

* Return large launchpad item costs

hidden -> debugonly

* Remove the 4 orange squares from the large launch pad

Leaving the lights and launchpod alignments alone since that is campaign only.

* Sector damage tweaks

* Block loader/unloader progress bar changes (#4138)

* Change block loader/unloader progess bar color & bundle

ammo -> items

* Make block unloader bar go down

* Draw reconstructor in region during placement & unconnected (#4143)

* Draw reconstructor in region during placement & unconnected

* Same as the previous commit, but for block loaders & unloaders

* Bugfixes

* Fixed #4164 / Fixed #4159

* fix german translation for editor.unsaved (#4169)

* update KO bundles (#3956)

* Update steam description for 6.0 update

* Update achievements.vdf

* oops.

* Update full_description.txt

* Update summary.txt

* add recent changelog

* Update bundle_ko.properties

* last update on this week

(well, sunday)

* upload android recent change-log

* critical fix

* [KO] Small fix (#4133)

* why

* Update bundle_ko.properties

* bundle_hu.properties (#4170)

I'am continue translating and adding lines to v6.

* [Bundle][RO] Translation update (#4115)

* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 43757a247e
- Typo fixes & various other improvements

* no

* yet another in_ID translation update (#4086)

* yet another in_ID translation update

* more id translate

Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com>

* Cleanup

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com>
Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com>
Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com>
Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com>
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
Co-authored-by: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Co-authored-by: Catchears <57631841+Catchears@users.noreply.github.com>
Co-authored-by: Sharlotte <60801210+sharlotte-mobile@users.noreply.github.com>
Co-authored-by: Vajda Simon <75036456+VajdaSimon@users.noreply.github.com>
Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>
Co-authored-by: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com>
Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com>

* Update gradle.properties

* Update bundle_zh_TW.properties

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com>
Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com>
Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com>
Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com>
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
Co-authored-by: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Co-authored-by: Catchears <57631841+Catchears@users.noreply.github.com>
Co-authored-by: Sharlotte <60801210+sharlotte-mobile@users.noreply.github.com>
Co-authored-by: Vajda Simon <75036456+VajdaSimon@users.noreply.github.com>
Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>
Co-authored-by: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com>
Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com>
2021-01-04 10:38:18 -05:00
Antsiferov Andrew
4b71b4f80a Make mod browser case insensitive (#4258) 2021-01-04 10:33:43 -05:00
Anuken
5712190dab cleanup 2021-01-03 18:01:44 -05:00
Anuken
af636f74fc Core incineration tweaks 2021-01-03 16:52:54 -05:00
Patrick 'Quezler' Mounier
0cfdacdd28 Allow for core incineration via rules (#4242) 2021-01-03 16:48:25 -05:00
Patrick 'Quezler' Mounier
3eb0857906 Building tile > Building build @ Inputhandler.java (#4241)
Was weird to see `if(player != null) tile.lastAccessed = player.name;` in there.
2021-01-03 16:18:39 -05:00
Joshua Fan
0f3716b8dd Logic: Fix radar from value bug (#4236)
* Logic: Fix radar from value bug

* Use constructor to modify variable initialization
2021-01-03 15:38:09 -05:00
TranquillyUnpleasant
dbe2f7eefa Fix mirror being offset (#4248)
Because apparently it isn't a valid map even though its been a known issue for months.
2021-01-03 13:45:35 -05:00
Anuken
3497212b95 Merge remote-tracking branch 'origin/master' 2021-01-03 12:43:19 -05:00
Anuken
2ae864f4d3 Made logic processors reset variables on edit 2021-01-03 12:43:15 -05:00
Patrick 'Quezler' Mounier
200eb26b78 Added Call#clearItems (#4243) 2021-01-03 12:42:42 -05:00
Anuken
e9c93ab3a0 Revert radar statement changes 2021-01-02 17:38:04 -05:00
Anuken
e70221f6dd Fixed #4235 2021-01-02 16:05:22 -05:00
Anuken
c4d72eef39 Don't configure processor when no changes are made 2021-01-02 14:40:08 -05:00
Anuken
42ae5e90b0 Headless access of bridge/node opacity 2021-01-02 13:08:32 -05:00
Patrick 'Quezler' Mounier
fe92ce557f Draws build request bridges using bridge opacity (#4180)
* Update ItemBridge.java

* Introduce renderer.bridgeOpacity
2021-01-02 13:06:13 -05:00
Anuken
bf81565e93 Merge remote-tracking branch 'origin/master' 2021-01-02 11:58:43 -05:00
Anuken
981dec098a Fixed #4232 2021-01-02 11:58:34 -05:00
Marko Zajc
d65506e420 Support IPv6 addresses properly (#4225)
* Support IPv6 addresses properly

support the `[ipv6]:port` and `ipv6` formats
silly cat forgot that ipv6 is a thing

* unnecessary self promotion

* less split more substring

* also display ipv6 format properly

* important security fixes
2021-01-02 10:52:14 -05:00
Anuken
73d009666e Merge remote-tracking branch 'origin/master' 2021-01-01 15:34:40 -05:00
Anuken
a9c4ccdf48 Fixed #4222 2021-01-01 15:34:32 -05:00
Catchears
035d7fed77 update german bundle (#4218) 2021-01-01 13:50:30 -05:00
Anuken
0374ec5e4a Merge remote-tracking branch 'origin/master' 2021-01-01 12:00:51 -05:00
Joshua Fan
0a92e64498 Remove turret1 from uradar (#4207) 2021-01-01 11:32:58 -05:00
Lapis
0b6194cfc9 Update bundle_ja.properties (#4210)
* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties
2021-01-01 11:32:15 -05:00
Lonami
044fb30b1b Support inline comments (#4196)
* Support inline comments

Closes https://github.com/Anuken/Mindustry-Suggestions/issues/1698.

* Apply suggestions from code review

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

* Stick with Mindustry formatting style

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
2020-12-31 16:30:35 -05:00
Anuken
727b47dba5 Preload naval paths on liquid spawns 2020-12-30 19:35:23 -05:00
MEEP of Faith
ab19e6ffbd Launchpad Launch Sound (#4146)
* Launchpad Launch Sound

* Update LaunchPad.java
2020-12-30 19:27:50 -05:00
Anuken
f5410c5712 #4129 2020-12-30 16:58:42 -05:00
Patrick 'Quezler' Mounier
b79a6f6b32 Fix block status of repair point and battery (#4187)
* Fix block status of repair point and battery

* Update Battery.java

* Update RepairPoint.java
2020-12-30 15:30:49 -05:00
Anuken
b672434e83 arc 2020-12-30 10:23:45 -05:00
Anuken
9b087dc55d Fixed #4183 2020-12-30 10:05:18 -05:00
Anuken
8d10cafc99 Merge remote-tracking branch 'origin/master' 2020-12-29 19:48:36 -05:00
Anuken
6e1eedc1ab Cleanup 2020-12-29 19:48:30 -05:00
Thomas Widyantoko
f5ce75e962 yet another in_ID translation update (#4086)
* yet another in_ID translation update

* more id translate

Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com>
2020-12-29 17:40:59 -05:00
YellOw139
0d643a3ece [Bundle][RO] Translation update (#4115)
* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 43757a247e
- Typo fixes & various other improvements

* no
2020-12-29 17:40:22 -05:00
Vajda Simon
9632fc5f1f bundle_hu.properties (#4170)
I'am continue translating and adding lines to v6.
2020-12-29 17:39:55 -05:00
Sunny Kim
84bb3ee3de [KO] Small fix (#4133)
* why

* Update bundle_ko.properties
2020-12-29 17:39:19 -05:00
Anuken
83b20a90e6 Merge remote-tracking branch 'origin/master' 2020-12-29 11:40:57 -05:00
Anuken
f89f1e2346 critical fix 2020-12-29 11:40:53 -05:00
Sharlotte
cc6b0c328f update KO bundles (#3956)
* Update steam description for 6.0 update

* Update achievements.vdf

* oops.

* Update full_description.txt

* Update summary.txt

* add recent changelog

* Update bundle_ko.properties

* last update on this week

(well, sunday)

* upload android recent change-log
2020-12-29 10:44:19 -05:00
Catchears
e17bcd6a01 fix german translation for editor.unsaved (#4169) 2020-12-29 10:40:29 -05:00
Anuken
6357c17f8a Fixed #4164 / Fixed #4159 2020-12-29 10:13:27 -05:00
Anuken
add3fd9fb3 Merge remote-tracking branch 'origin/master' 2020-12-28 14:52:33 -05:00
Anuken
98e6303765 Bugfixes 2020-12-28 14:51:50 -05:00
Patrick 'Quezler' Mounier
0e1e399788 Draw reconstructor in region during placement & unconnected (#4143)
* Draw reconstructor in region during placement & unconnected

* Same as the previous commit, but for block loaders & unloaders
2020-12-28 12:23:06 -05:00
Patrick 'Quezler' Mounier
d84a36b8ee Block loader/unloader progress bar changes (#4138)
* Change block loader/unloader progess bar color & bundle

ammo -> items

* Make block unloader bar go down
2020-12-28 10:44:59 -05:00
Anuken
db40f154c5 Sector damage tweaks 2020-12-28 10:42:51 -05:00
Patrick 'Quezler' Mounier
e714d44a0e Return large launchpad item costs (#4134)
* Return large launchpad item costs

hidden -> debugonly

* Remove the 4 orange squares from the large launch pad

Leaving the lights and launchpod alignments alone since that is campaign only.
2020-12-28 09:38:58 -05:00
Patrick 'Quezler' Mounier
6eb604585b Removed packed sprite section from CONTRIBUTING.md (#4152) 2020-12-28 09:38:34 -05:00
alex
7555d43418 Update servers_v6.json (#4148)
changed the port number for our attack server.
sorry for the inconvenience, i don't have control over the port number of this "alexmindustryattac.ddns.net" hosted server.
2020-12-27 22:29:35 -05:00
Anuken
3ef67cab69 Fixed #4147 2020-12-27 20:41:29 -05:00
Anuken
72686b3ef8 Merge remote-tracking branch 'origin/master' 2020-12-27 16:20:17 -05:00
Anuken
990562dd71 Use sector preset name for maps if possible 2020-12-27 16:20:06 -05:00
Patrick 'Quezler' Mounier
2239ca6372 Remove 4 square blocks from the accelerator (#4139)
* Normalize rule comment line endings

Just so i can get a new patch-## branch where i can drag my accelerator sprite on since github isn't smart enough yet to see that as a possible pull request by itself.

* Add files via upload

* Add files via upload
2020-12-27 13:32:04 -05:00
Anuken
f174d1b2b4 Faster power graph reload / Fixed iOS editor margin 2020-12-27 12:59:49 -05:00
Anuken
a04e7d5612 Merge remote-tracking branch 'origin/master' 2020-12-27 10:16:39 -05:00
Anuken
16778ea16c Fixed #4141 / Fixed #4136 2020-12-27 10:16:34 -05:00
Sunny Kim
a606d9d85c bugfixes, call me the mother of the block forge (#4135)
(anuke is the father)
2020-12-27 10:04:19 -05:00
Sunny Kim
8d18649323 Block (un)loader major improvements (#4127)
* make it consider consVaild

* make this too

* pattern style and max block size

* Is there a better way to do this?

* Update BlockUnloader.java

* do not the /0

* prevent /0

* test 1

* yup it works for enabled
2020-12-26 22:10:37 -05:00
Anuken
c02d603a7a Search bar cleanup 2020-12-26 11:39:58 -05:00
DeltaNedas
8e4b35eb07 SearchBar class - add search bars to mods (#3267)
* Create SearchBar and make ModsDialog use it

* add search bar to servers

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* a

* fix mods menu not rowing

* remove search bar for remote servers

* h

* hide searchbar on landscape mobile

* anukes feedback

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Anuken <arnukren@gmail.com>

* java dumb

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2020-12-26 11:22:11 -05:00
Anuken
fda9357b4b Fixed #4128 2020-12-26 09:49:03 -05:00
Anuken
4517b55f76 Building priority fix 2020-12-26 09:43:45 -05:00
Anuken
f014339dbc Don't render weather in full map screenshots 2020-12-25 21:51:25 -05:00
Anuken
9f8fce72d3 Better build beam visuals 2020-12-25 21:49:10 -05:00
Anuken
834e4f175b Fixed #4122 2020-12-25 15:56:53 -05:00
Anuken
bba52e99e0 Fixed #4121 2020-12-25 12:34:02 -05:00
Anuken
42d350f87f Merge remote-tracking branch 'origin/master' 2020-12-25 10:58:01 -05:00
Anuken
4339042078 Fixed #4120 2020-12-25 10:57:54 -05:00
Volas171
946bfa1bfd Update servers_v6.json (#4095)
* Update servers_v6.json

the ip changed to not make users confuse

* Update servers_v6.json
2020-12-25 10:13:38 -05:00
Anuken
f86291c587 Merge remote-tracking branch 'origin/master' 2020-12-25 01:26:24 -05:00
Anuken
da96b23441 Higher power source output 2020-12-25 01:26:20 -05:00
彭瑞暄
d2ae9cf809 Up-to-date zh-TW translations (#4083)
* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
2020-12-25 00:03:35 -05:00
Sunny Kim
beed2e0b8f Block Forge improvements (#4112)
* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot
2020-12-25 00:02:15 -05:00
Anuken
92e7cec198 Merge remote-tracking branch 'origin/master' 2020-12-24 23:17:42 -05:00
Anuken
eda6770e11 Fixed mined item flashing on clients 2020-12-24 23:17:35 -05:00
fuzzbuck
7cc3e23e9a typo (#4110) 2020-12-24 18:28:08 -05:00
fuzzbuck
7bf263fdfa add new io server (#4109)
soon to be up gamemode
2020-12-24 16:16:19 -05:00
Antsiferov Andrew
43757a247e [QoL] Chat modes (#3869)
Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).
2020-12-24 16:05:41 -05:00
Anuken
1e8621d9d4 Merge remote-tracking branch 'origin/master' 2020-12-24 11:43:08 -05:00
Anuken
0940abe98c Fixed #4108 2020-12-24 11:43:04 -05:00
younggam
4a71564d03 mod version check fix (#4100)
* Update Version.java

* Update contributors
2020-12-24 10:36:55 -05:00
Patrick 'Quezler' Mounier
9397bd57c4 Prevents plastanium conveyor unload exploit (#4098)
* Prevent unloaders from unloading plast loading dock

* Use overridable boolean method unloadable instead

* unloadable -> canUnload
2020-12-24 10:33:40 -05:00
Patrick 'Quezler' Mounier
85a668c202 Prevent visual plastanium conveyor glitch when disabled (#4101) 2020-12-24 09:47:43 -05:00
Anuken
90372171b2 Fixed #4104 2020-12-24 09:44:24 -05:00
Anuken
2523088b4c Merge remote-tracking branch 'origin/master' 2020-12-23 20:39:25 -05:00
Anuken
f5c270347c Version parse fix 2020-12-23 14:37:39 -05:00
QmelZ
032b254e93 fix typo (#4093) 2020-12-23 14:28:58 -05:00
Anuken
a21cc32be9 Marked mod browser as WIP 2020-12-23 12:33:56 -05:00
Anuken
06f832bfae Merge remote-tracking branch 'origin/master' 2020-12-23 12:21:41 -05:00
Anuken
79423e4c60 Mod browser initial implementation 2020-12-23 12:21:25 -05:00
Catchears
c92f662994 german translation (#3726)
* german achievement translation

* typo

* change from Ordoviz

* typos

* duzen statt siezen

* update bundle
2020-12-23 12:10:35 -05:00
Volas171
eeed998c7c update v6 list (#4091)
Alex servers have now updated and use hub
2020-12-23 12:10:02 -05:00
Anuken
8ac027af70 More browser cleanup 2020-12-23 12:03:43 -05:00
YellOw139
15b865e550 [Bundle][RO] Translation update (#4039)
* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit commit
- Typo fixes & various other improvements

* don't do bad choices

* some polishing

* typo

* The 7.0 [combat] experience

* Rebranding
2020-12-23 12:02:37 -05:00
Patrick 'Quezler' Mounier
1e7e66c424 Rename existing Power Infinite with Power Source (#4090) 2020-12-23 12:02:28 -05:00
Felix Corvus
0524447c78 [Bundle][RU] actual L10n (#3680)
* 1 line changed

- noname

* 1 line changed

- hint.placeTurret

* 3 new lines

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

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

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

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

* 5 changed lines; 2 new lines

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

New:
hint.coreIncinerate
hint.coopCampaign

* 2 changed line

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

* 2 changed lines

hint.coreIncinerate
block.interplanetary-accelerator.description

* 3 new line; 1 changed line

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

Changed:
keybinds.mobile

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

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

Changed:
bullet.knockback

Deleted:
bar.limitreached

* Update bundle_ru.properties

падежи

* Update bundle_ru.properties

мелочи

* 1 changed line

stat.ammouse

Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
2020-12-23 11:56:33 -05:00
Anuken
b6f1b67b24 Merge branch 'master' into ThePythonGuy3-patch-1 2020-12-23 10:51:56 -05:00
Anuken
715d94967e Cleanup 2020-12-23 10:51:24 -05:00
MEEP of Faith
a21f79ac6a Draw size independent from puddle size. (#3826)
* Draw size independent from puddle size.

* Apply change to Bullets
2020-12-23 10:29:26 -05:00
Sunny Kim
986caa857e public SettingsTables for mod settings (#4085) 2020-12-23 09:41:43 -05:00
Sunny Kim
1a14860b62 bump editor only blocks foward (#4084) 2020-12-23 09:40:00 -05:00
Patrick 'Quezler' Mounier
d144e9c91c Allow plastanium conveyor to be unloaded (#4087) 2020-12-23 09:39:29 -05:00
Patrick 'Quezler' Mounier
9d740e1e37 Rebrand power infinite as power source (#4088) 2020-12-23 09:39:04 -05:00
Anuken
054e2337ff Merge remote-tracking branch 'origin/master' 2020-12-22 20:13:40 -05:00
Anuken
71488313e1 Fixed #4082 2020-12-22 20:13:34 -05:00
Anuken
a44f3c379f Ammo/shot display 2020-12-22 15:10:48 -05:00
Patrick 'Quezler' Mounier
e1125a38da Update servers_be.json (#4081) 2020-12-22 14:14:17 -05:00
Anuken
f3d5cb315e Cleanup 2020-12-22 13:51:11 -05:00
Anuken
d3f99105b2 Merge remote-tracking branch 'origin/master' 2020-12-22 13:42:01 -05:00
Anuken
7f49f0c6fa Fixed #4079 2020-12-22 13:41:54 -05:00
Anuken
ceb298ca0b cleanup 2020-12-22 12:52:01 -05:00
VozDuh
0aaa77a5ea Scrap Walls Textures Cleanup (#4074) 2020-12-22 11:31:24 -05:00
Sunny Kim
79d4925761 THIS WAS WHAT IT WAS ALL ALONG (#4069) 2020-12-22 11:30:09 -05:00
Anuken
7ea12e97ec Fixed #4073 2020-12-22 11:28:33 -05:00
Anuken
8521d5cd1b Merge remote-tracking branch 'origin/master' 2020-12-22 11:20:43 -05:00
Anuken
17177f87aa Fixed #4071 2020-12-22 11:20:35 -05:00
Anuken
24c71e49c7 cleanup 2020-12-22 10:48:11 -05:00
Skybbles
ac06fa8f96 update my github name (#4070)
updating my name here since I changed my username
2020-12-22 10:33:07 -05:00
Anuken
eda134a18c Merge remote-tracking branch 'origin/master' 2020-12-21 20:48:07 -05:00
Anuken
852013cd63 #4068 2020-12-21 20:48:00 -05:00
Sunny Kim
5b163d7843 Heat for accelerator (#4065)
* heat

* better animations
2020-12-21 20:04:04 -05:00
Anuken
806cea4b33 Added building damage to bullet stats 2020-12-21 16:55:04 -05:00
Anuken
952639a72e Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-21 13:10:00 -05:00
Anuken
e4e428f84a Fixed #4064 2020-12-21 13:09:08 -05:00
Patrick 'Quezler' Mounier
9a577adf5f Makes Drill.drawMineItem default to true (#4057)
* Update Blocks.java

* Update Drill.java
2020-12-20 15:22:34 -05:00
Anuken
e3c68b485d Placement rendering cleanup 2020-12-20 14:28:14 -05:00
Anuken
75a4d2901f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-20 14:22:27 -05:00
Patrick 'Quezler' Mounier
bbdcef62e4 Draw item in the drill center when in place mode (#4055)
* Draw item in the drill center when in place mode

* Update core/src/mindustry/world/blocks/production/Drill.java

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Anuken <arnukren@gmail.com>
2020-12-20 14:22:14 -05:00
Patrick 'Quezler' Mounier
118ae8e87d #3889 2: electric boogaloo (#4056) 2020-12-20 14:22:01 -05:00
Anuken
40a6a9e1c7 Comment cleanup 2020-12-20 12:04:36 -05:00
Patrick 'Quezler' Mounier
22221a0f28 Add in region to payload block icons (#4052) 2020-12-20 09:58:18 -05:00
Anuken
c39f4c1b7d Fixed #4051 2020-12-20 09:50:29 -05:00
Anuken
082b04a143 Merge remote-tracking branch 'origin/master' 2020-12-20 09:47:52 -05:00
Anuken
4f683cac8b Fixed #4054 2020-12-20 09:47:45 -05:00
YellOw139
0d2b660ed1 Ty po (#4046) 2020-12-19 14:01:50 -05:00
Anuken
f9fe396d1f Fixed #4044 2020-12-19 13:02:20 -05:00
Anuken
a4f4b9367f Tweaks of merged PR 2020-12-19 12:32:03 -05:00
키에르
09a84550f4 Ask double pop-ups to create a public server (#4042)
* Double check public host dialog

* Update bundle.properties

* Update core/src/mindustry/ui/dialogs/HostDialog.java

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
2020-12-19 12:31:26 -05:00
Anuken
9e05f7604d Fixed #4043 2020-12-19 12:28:56 -05:00
Anuken
e5982faf35 Merge remote-tracking branch 'origin/master' 2020-12-18 20:39:23 -05:00
Anuken
7f863abb06 Hide map when opening planet map 2020-12-18 20:39:16 -05:00
Volas171
b328d098a1 add minty server but this time the json is all right (#4034) 2020-12-18 19:16:59 -05:00
Anuken
0dd3c2cb5a Fixed #4033 2020-12-18 17:22:01 -05:00
Anuken
9d9cbdffd5 Pulsar nerf 2020-12-18 16:33:43 -05:00
Anuken
8d43590657 Multiblock damage calculation bugfix 2020-12-18 14:56:14 -05:00
Anuken
6783069f95 Merge remote-tracking branch 'origin/master' 2020-12-18 13:36:22 -05:00
Anuken
b33b3a7919 Always-on weather rule support 2020-12-18 13:36:18 -05:00
Anuken
b0bf80d8b7 Cleanup 2020-12-18 13:21:51 -05:00
Patrick 'Quezler' Mounier
abcd27184d Update Drill.java (#4030) 2020-12-18 13:08:03 -05:00
Anuken
5de2c0c512 Merge remote-tracking branch 'origin/master' 2020-12-18 12:41:23 -05:00
Anuken
bd25294096 Generic node/bridge placement system 2020-12-18 12:41:13 -05:00
Ilya246
a8bae56b2c fix comment (#4026) 2020-12-18 09:44:15 -05:00
Anuken
d80678dfeb arc 2020-12-18 09:43:17 -05:00
Anuken
a4f9518d1e testing winMM 2020-12-18 09:42:57 -05:00
Anuken
91692f362f Mod browser cleanup 2020-12-17 21:17:55 -05:00
Anuken
6815f3305f Better bridge linking 2020-12-17 18:35:50 -05:00
Anuken
0cc3340bd6 Fixed texture packer Gradle dependencies 2020-12-17 14:37:13 -05:00
Anuken
8da18984d2 Removed redundant Block#isVisible code 2020-12-17 12:38:22 -05:00
Patrick 'Quezler' Mounier
056afa572e Allow hidden blocks to be revealed by plugins (#4017)
* Add revealedBlocks rule

(1/2)

* Use revealedBlocks rule

(2/2)
2020-12-17 12:37:47 -05:00
Anuken
9f5183b36f Building cleanup 2020-12-17 11:38:03 -05:00
Anuken
0d81681af5 Merge remote-tracking branch 'origin/master' 2020-12-17 10:46:53 -05:00
Anuken
4b1554db54 arc 2020-12-17 10:46:49 -05:00
Charlotte Vixen
c58289dd47 added conduit color indications (#4015) 2020-12-17 10:20:29 -05:00
Patrick 'Quezler' Mounier
cfd67bb1fc Fix sprite packing typo (#4016) 2020-12-17 10:15:58 -05:00
rMuchan
9a777f3ce5 fix health calculation in background sectors (#4011) 2020-12-17 10:09:28 -05:00
Anuken
b8efed9eaf Better space skybox scaling 2020-12-16 19:52:10 -05:00
Anuken
cd7d2163b9 Merge remote-tracking branch 'origin/master' 2020-12-16 19:47:43 -05:00
Anuken
59c85a486f Fixed phase deflect achievement 2020-12-16 19:47:40 -05:00
DeltaNedas
8bc349b68c add @commanded for units (#3870) 2020-12-16 19:42:48 -05:00
Angel_24
b12cac7b30 Update bundle_es.properties (#4002)
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Tweaks from a newer pull request

Added changes based on the Frankz30's Pull request: [ https://github.com/Anuken/Mindustry/pull/3879#issue-534932998 ]

* Added translations for wheather graphics and report bugs options
2020-12-16 19:41:07 -05:00
Thomas Widyantoko
bd85d1d7ca update in_ID translation (#4003)
* update in_ID translation

* weather graphics setting

suggestion from Discord
2020-12-16 19:40:52 -05:00
Xelo
9a88426ff7 raw strings for SurfaceShaders (#4004)
* SurfaceShaders thing

* Update core/src/mindustry/graphics/Shaders.java

spacing fix

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* star import

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
2020-12-16 19:39:08 -05:00
Anuken
d0bf3d6fa1 Merge remote-tracking branch 'origin/master' 2020-12-16 19:33:36 -05:00
Anuken
bc2c7be45d Fixed #4010 2020-12-16 19:33:29 -05:00
DeltaNedas
74a7dc5eb9 allow mods to set zoom limits (#4006)
* allow mods to set zoom limits

* rounding

* dont round min

* zoom 1.5 -> 1
2020-12-16 16:41:08 -05:00
Anuken
3db04da20a Payload tweaks 2020-12-16 13:35:55 -05:00
Anuken
d0cba1aff2 Code cleanup 2020-12-16 10:39:28 -05:00
Anuken
4ad234ad75 Merge remote-tracking branch 'origin/master' 2020-12-16 09:28:11 -05:00
Anuken
e6717b37ce Fixed #4000 2020-12-16 09:28:06 -05:00
Amaoto Inochi
15116ca384 fix the wrong unit ai path of mod content parser (#3998) 2020-12-15 19:55:31 -05:00
Anuken
446dd6abe5 Consistent water bullet drag 2020-12-15 19:25:23 -05:00
Anuken
ff254d4fdf Fixed #3997 2020-12-15 19:09:33 -05:00
Anuken
eaa5e6f5a1 Increased foreshadow coolant multiplier 2020-12-15 18:39:44 -05:00
Anuken
b90f51224c Fixed #3996 2020-12-15 18:07:15 -05:00
Anuken
475bef1d78 Fixed sprite antialiasing 2020-12-15 17:43:01 -05:00
Anuken
dd9095bfba Cleanup 2020-12-15 15:31:45 -05:00
Anuken
50125166a6 Merge remote-tracking branch 'origin/master' 2020-12-15 15:24:14 -05:00
Anuken
47e321f57d Removed atlas outputs 2020-12-15 15:24:09 -05:00
Recessive
144751bdce Update servers_v6.json (#3983)
Added {AA} Assault
2020-12-15 14:28:52 -05:00
L0615T1C5-216AC-9437
6cc3676f5e Final addition to the CN Network (#3986)
introducing a new unique game mode, Mech-Battles, were players fight against each other.
2020-12-15 14:28:36 -05:00
Anuken
6ab96e2787 Fixed #3987 2020-12-15 14:15:06 -05:00
Anuken
659c481c83 cleanup 2020-12-15 11:15:39 -05:00
Anuken
a18e1854ab Null checks & cleanup of upgrade pathing 2020-12-15 10:58:03 -05:00
Anuken
6c67dc1266 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-15 10:52:38 -05:00
Slava0135
0c581c520f Conveyor upgrade system (#3912)
* conveyor/conduit upgrading system

* style
2020-12-15 10:52:20 -05:00
Anuken
c6c18696c0 Cleanup 2020-12-15 10:28:12 -05:00
Somka000
4b1c55b876 Update server (#3984) 2020-12-15 09:59:46 -05:00
Anuken
5ab090f28d Merge remote-tracking branch 'origin/master' 2020-12-14 22:56:06 -05:00
Anuken
8a5bd7571e 121.3 2020-12-14 22:55:58 -05:00
Fernando
3cb0cc9a3c Brazil is under maintenance (#3898)
We will be back later
2020-12-14 20:07:02 -05:00
Anuken
ff93c21269 Merge remote-tracking branch 'origin/master' 2020-12-14 16:31:01 -05:00
Anuken
0512e54df5 Merge remote-tracking branch 'origin/master' 2020-12-14 13:42:52 -05:00
Anuken
cec1eb5608 Fixed jitpack build error 2020-12-14 13:42:48 -05:00
L0615T1C5-216AC-9437
1c6ebd3f6a retire CN from v5 Mindustry (#3977) 2020-12-14 13:31:41 -05:00
Anuken
16f7a8e9d2 Merge remote-tracking branch 'origin/master' 2020-12-14 13:29:59 -05:00
Anuken
889c53dc1b Update SERVERLIST.md 2020-12-14 13:26:42 -05:00
Anuken
f4d0dfd0da Less junction capacity (again) 2020-12-14 10:36:37 -05:00
Skat
aee5d46dfa Code formatting (#3904) 2020-12-13 23:56:13 -05:00
alex
6286b0b275 Add ALEX v6 servers to servers_v6.json (#3927) 2020-12-13 23:52:15 -05:00
Sharlotte
5223a89bf1 Update bundle_ko.properties (#3953)
fix some miss-translation
add translated values
2020-12-13 23:47:00 -05:00
YellOw139
5b11dbc085 [Bundle][RO] Translation Update (#3957)
This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 98c4ee6e74
- Typo fixes & various other improvements
2020-12-13 23:46:50 -05:00
GamyGamer
df1f8b8bb4 Update bundle_pl.properties (#3964)
Added missing lines and fixed typo
2020-12-13 23:46:39 -05:00
DeltaNedas
ffa7256e5a add ContentInitEvent (#3951)
* add ContentInit(ialized)Event

* a

* a
2020-12-13 23:43:27 -05:00
Anuken
bbf84185cc Fixed #3973 2020-12-13 23:40:06 -05:00
Anuken
901c23f295 Fixed #3969 2020-12-13 18:01:22 -05:00
Anuken
1c8d368d3b Merge remote-tracking branch 'origin/master' 2020-12-13 16:28:32 -05:00
Anuken
37ebae20d7 Removed tools.jar 2020-12-13 16:28:29 -05:00
Anuken
e25f0c6ae2 Merge pull request #3967 from DeltaNedas/version
disallow descriptions after mod version
2020-12-13 16:26:23 -05:00
Anuken
484b480076 Fixed #3968 2020-12-13 16:25:36 -05:00
DeltaNedas
926497ba77 disallow descriptions after mod version 2020-12-13 19:30:21 +00:00
Anuken
ddd9f2259c Fixed #3960 2020-12-13 10:27:44 -05:00
Anuken
d6546a38c0 #3830 2020-12-12 18:49:24 -05:00
Anuken
d171048004 Merge pull request #3950 from Auswaschbar/master
Fix units aiming sidewards missing their aim
2020-12-12 16:47:01 -05:00
Karl-Robert Ernst
4aebba0a0c fix units aiming sidewards missing their aim 2020-12-12 22:11:19 +01:00
Anuken
8afb6006ce Merge pull request #3941 from DeltaNedas/public
make some proc stuff public
2020-12-12 13:27:22 -05:00
Anuken
d117eb249e Merge remote-tracking branch 'origin/master' 2020-12-12 13:26:34 -05:00
Anuken
768d14088a Fixed #3943 2020-12-12 13:26:30 -05:00
Anuken
86f16bfc94 Merge pull request #3934 from LottieVixen/fix-issue
fixed an error in global.js
2020-12-12 11:31:36 -05:00
Anuken
8fa6b76bf9 Fixed #3936 2020-12-12 11:14:17 -05:00
DeltaNedas
19af1a0cc8 make some proc stuff public 2020-12-12 15:57:43 +00:00
Charlotte Lily-Llaitchee Vixen
409d27e3df found more occurances of the error 2020-12-12 07:23:23 +00:00
Charlotte Lily-Llaitchee Vixen
d47abd4f83 fixed an error in global.js 2020-12-12 07:15:24 +00:00
Anuken
e6c4a6cf69 Fixed #3932 2020-12-11 23:52:43 -05:00
Anuken
7c80af85e3 Property cleanup 2020-12-11 19:28:03 -05:00
Anuken
6983f57459 circleTarget unit AI parameter 2020-12-11 18:54:03 -05:00
Anuken
adeeaa6e27 Merge remote-tracking branch 'origin/master' 2020-12-11 12:56:10 -05:00
Anuken
075e7cf5d8 Disabled poly spawns 2020-12-11 12:56:07 -05:00
Anuken
98c4ee6e74 Merge pull request #3855 from AFFalcons/patch-1
[QOL] Ability to Disable Weather Effects
2020-12-11 12:52:07 -05:00
Anuken
87f9a077ac Increase wave spacing by 10sec every sector defeat 2020-12-11 12:43:43 -05:00
Anuken
bc26d3ba7b Merge remote-tracking branch 'origin/master' 2020-12-11 11:48:27 -05:00
Anuken
daaea591e4 Implemented #3486 with some minor changes 2020-12-11 11:48:20 -05:00
Anuken
175d66ad72 Merge pull request #3843 from Nikolass1000/patch-6
Update achievements.vdf [PL]
2020-12-11 11:13:54 -05:00
Anuken
c444cbf623 Merge pull request #3908 from buthed010203/patch-2
Delete old bleeding edge builds on update
2020-12-11 10:52:19 -05:00
Anuken
c54f398063 Fixed Parallax not moving players serverside 2020-12-10 18:21:39 -05:00
Anuken
2d6db1583b Improved approach behavior in formations/logic 2020-12-10 12:51:07 -05:00
buthed010203
b3beb92557 fixed 2020-12-10 12:18:11 -05:00
buthed010203
0f8304674f now 100% less readable 2020-12-10 11:54:47 -05:00
buthed010203
3b3daf0e25 Delete old bleeding edge builds on update 2020-12-10 11:41:50 -05:00
Anuken
28e18332a0 Decreased junction item capacity 2020-12-10 09:58:09 -05:00
Anuken
dcc4764914 Merge remote-tracking branch 'origin/master' 2020-12-10 09:50:12 -05:00
Anuken
ee4ace1146 Fixed #3902 2020-12-10 09:50:06 -05:00
Anuken
1faffadcab Merge pull request #3905 from Quezler/patch-81
Prevent accelerator from blending with conveyors
2020-12-10 09:35:33 -05:00
Patrick 'Quezler' Mounier
2da7afc081 Update Accelerator.java 2020-12-10 12:15:29 +01:00
Patrick 'Quezler' Mounier
e5b341c63e Prevent accelerator from blending with conveyors 2020-12-10 12:14:57 +01:00
Anuken
a544888f16 cleanup 2020-12-09 20:20:22 -05:00
Anuken
57ad1d5366 Fixed #3899 2020-12-09 20:19:54 -05:00
Anuken
42d66d1136 Sector item system cleanup 2020-12-09 16:26:50 -05:00
Anuken
999cc9c651 Fixed #3890 2020-12-09 14:02:38 -05:00
Anuken
9537051590 Merge pull request #3836 from Nikolass1000/patch-5
Update polish bundle
2020-12-09 11:10:02 -05:00
Anuken
827372633d Merge pull request #3838 from YellOw139/patch-3
[Bundle][RO][Ready-for-Stable] Translation Update
2020-12-09 11:09:42 -05:00
Anuken
dcf0b15b2c Fixed #3888 2020-12-09 11:08:22 -05:00
Anuken
c93bc0e457 Fixed #3884 / Fixed #3881 / Fixed #3880 2020-12-09 10:49:26 -05:00
Anuken
1460a15942 Fixed #3874 2020-12-08 21:36:20 -05:00
Anuken
15a07a4a18 Merge remote-tracking branch 'origin/master' 2020-12-08 16:43:27 -05:00
Anuken
e07a203d56 Don't use mods for floor decoration 2020-12-08 16:43:23 -05:00
Anuken
cead92b2c7 Merge pull request #3865 from Ordoviz/master
Improve German translation
2020-12-08 14:31:26 -05:00
Anuken
8d4ab2d7fb Cleanup 2020-12-08 14:23:13 -05:00
Anuken
9bd2057237 Fixed #3871 2020-12-08 14:07:18 -05:00
Lennard Hofmann
5ec5f1aa93 Improve German translation 2020-12-08 17:09:37 +01:00
Anuken
5e10c9d416 Decreased slag viscosity 2020-12-08 10:13:08 -05:00
Matthew
881491d151 Requested Changes 2020-12-08 09:10:30 -06:00
Matthew
863159a5fe Init 2020-12-07 18:14:58 -06:00
Anuken
849943a0de Increased surge smelter item capacity 2020-12-07 18:57:59 -05:00
Anuken
b5abc23c9d Minor Fungal Pass tweaks 2020-12-07 16:27:25 -05:00
Anuken
c2b03a3fdc Merge remote-tracking branch 'origin/master' 2020-12-07 15:52:53 -05:00
Anuken
4e1d999838 Rounded up lancer requirements 2020-12-07 15:52:50 -05:00
Anuken
4af971776f Rounded up lancer requirements 2020-12-07 15:48:07 -05:00
Anuken
86d2788232 Merge pull request #3735 from Nikolass1000/patch-4
Fix for missing foreshadow description [PL]
2020-12-07 15:18:13 -05:00
Anuken
5654e3120d Logic constant optimizations / Display admins on top 2020-12-07 12:51:31 -05:00
Anuken
b4e7928622 Test fixes 2020-12-07 12:12:08 -05:00
Anuken
25125f5a9b Removed Tile#bc(), use Tile.build instead 2020-12-07 11:44:57 -05:00
Anuken
5d4b8a43e3 Merge remote-tracking branch 'origin/master' 2020-12-07 11:10:23 -05:00
Anuken
557cb1c532 Fixed #3834 / Fixed #3835 / Fixed #3837 2020-12-07 11:10:19 -05:00
Anuken
5594395ac1 Merge pull request #3840 from Quezler/patch-78
Fixes #3839
2020-12-07 10:58:26 -05:00
Nikolass1000
81b593c031 Update achievements.vdf 2020-12-07 14:30:08 +01:00
Patrick 'Quezler' Mounier
2a1ddf2573 Fixed #3839 2020-12-07 13:21:32 +01:00
YellOw139
fdb8da5767 [Bundle][RO][Ready-for-Stable] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).
Its strings are ready and _**merging**_ is _**recommended**_ for **_the next stable release._**

Changelog:

- New strings/changes up to commit f9cfc8a2b8
- Typo fixes & various other improvements
2020-12-07 13:50:55 +02:00
Nikolass1000
738aa26a20 Another completion 2020-12-07 10:41:16 +01:00
Anuken
5e0ba2f4af Merge remote-tracking branch 'origin/master' 2020-12-06 13:55:55 -05:00
Anuken
91b2d1a9bf Fixed #3824 2020-12-06 13:55:52 -05:00
Anuken
e636ceb317 Merge pull request #3791 from joshuaptfan/master
Enable double-click to play sector
2020-12-06 11:47:54 -05:00
Anuken
2eeb230694 Merge pull request #3792 from Neba-MD/master
Add TWS v6 to servers_v6.json
2020-12-06 11:10:48 -05:00
Joshua Fan
70cc6d07b0 Detect double-tap using count 2020-12-06 07:52:50 -08:00
Anuken
4d5c2c83fd Removed spawn shockwave delay 2020-12-06 10:50:13 -05:00
Anuken
cf91bcbd49 Run damage before spawn points activate 2020-12-06 10:23:24 -05:00
Anuken
18b19e964a Merge pull request #3773 from Diegator04/patch-2
Complete bundle_it
2020-12-06 09:32:24 -05:00
Anuken
bf1ace4791 Merge pull request #3747 from VitLogArx/patch-1
Update bundle_be.properties
2020-12-06 09:31:52 -05:00
Anuken
dcd56a2d87 Merge pull request #3751 from Angel-24/patch-3
Update bundle_es.properties
2020-12-06 09:31:41 -05:00
Anuken
67c1db0fcc Merge pull request #3765 from YellOw139/patch-2
[Bundle][RO][Ready-for-Stable] Translation Update
2020-12-06 09:31:24 -05:00
Anuken
6027fff543 Merge pull request #3811 from Prosta4okua/patch-2
[Bundle][Uk_ua]Update translation
2020-12-06 09:31:04 -05:00
Anuken
0c3c9fce2a Merge pull request #3815 from sharlotte-mobile/patch-2
Update bundle_ko.properties
2020-12-06 09:30:50 -05:00
Anuken
78c2f82adf Merge pull request #3817 from Quick-korkc/patch-16
more id translate
2020-12-06 09:28:50 -05:00
Quick-Korc
2d3b33bd9c more id translate 2020-12-06 14:33:57 +07:00
Joshua Fan
dd6ae80817 Merge remote-tracking branch 'origin/master' 2020-12-05 22:56:34 -08:00
Sharlotte
304bfb5a40 Update bundle_ko.properties
translated new hint value.
removed over-translated value.
checked some values and fix.
and do unification of some terms, reinforce poor translation etc
2020-12-06 15:18:57 +09:00
Joshua Fan
58c1718d01 Detect double-tap 2020-12-05 22:07:09 -08:00
Anuken
29fe5dab06 Allow client research 2020-12-05 21:24:27 -05:00
Anuken
f9024e5500 Consider sectors with bases unlocked 2020-12-05 21:14:10 -05:00
Anuken
25b77d1430 Merge remote-tracking branch 'origin/master' 2020-12-05 20:49:03 -05:00
Anuken
f9cfc8a2b8 Fixed #3812 / Fixed #3813 2020-12-05 20:48:56 -05:00
Anuken
8e74870857 Merge pull request #3804 from King-BR/patch-1
Brazillian servers V6
2020-12-05 19:20:29 -05:00
Prosta4okua
b32e4005dd Update description.txt 2020-12-06 02:17:57 +02:00
Prosta4okua
7094f3c848 Update description.txt 2020-12-06 02:16:47 +02:00
Prosta4okua
c8adfbce96 Update description.txt 2020-12-06 02:12:23 +02:00
Prosta4okua
ff94dd4d75 Виправлено досягнення у звʼязку з виходом 6.0 2020-12-06 01:34:00 +02:00
Anuken
d61bb66418 Fixed capture wave being set to 0 in some situations 2020-12-05 18:03:21 -05:00
Anuken
b0f62f25e6 No suggested mods 2020-12-05 17:53:49 -05:00
Anuken
bdbc9b865b Fixed distort artifacts 2020-12-05 17:50:29 -05:00
Prosta4okua
21c97571e0 Update bundle_uk_UA.properties 2020-12-06 00:45:30 +02:00
Prosta4okua
8e92be9037 Update bundle_uk_UA.properties 2020-12-06 00:42:18 +02:00
Anuken
f6428b8857 Fixed #3808 2020-12-05 16:40:54 -05:00
Neba-MD
db76ffe46a Update servers_v6.json 2020-12-06 05:31:51 +08:00
Anuken
cb3b43cc48 Disabled cursor scaling 2020-12-05 14:23:29 -05:00
Anuken
587c63fc92 Merge remote-tracking branch 'origin/master' 2020-12-05 14:16:06 -05:00
Anuken
97fa8057ba Fixed #3805 2020-12-05 14:16:02 -05:00
Fernando
d792956056 Brazillian servers V6
get in, we are going to Brazil
2020-12-05 15:46:55 -03:00
Anuken
6a2bb7b01f Merge pull request #3794 from sharlotte-mobile/patch-1
ko hotfix
2020-12-05 11:05:55 -05:00
Anuken
edbced6642 Fixed #3798 2020-12-05 10:58:30 -05:00
Anuken
8c0477f6bd Fixed #3795 2020-12-05 10:30:46 -05:00
Angel_24
4e00c4b015 Update bundle_es.properties 2020-12-05 14:06:20 +01:00
Sharlotte
42f0364319 ko hotfix
translate all missing values
removed over-translated values
and do Uniform some terms, correction of typos.
2020-12-05 20:10:03 +09:00
Neba-MD
a687aeb789 Update servers_v6.json 2020-12-05 17:32:00 +08:00
Joshua Fan
6ececea004 Enable double-click to play sector 2020-12-05 00:58:56 -08:00
Anuken
6570d23512 Fixed #3786 2020-12-04 19:24:09 -05:00
Anuken
7ec3ab5a17 Fixed #3784 2020-12-04 18:55:37 -05:00
Anuken
6af015cc05 Round maxProduction up 2020-12-04 15:22:59 -05:00
Anuken
7938e02e78 Fixed maxProduction stat being perSecond 2020-12-04 15:21:43 -05:00
Anuken
bac4bb8c8f Heighten export cap when production is negative 2020-12-04 15:20:15 -05:00
YellOw139
5ac1c32652 coreIncinerate 2020-12-04 22:19:56 +02:00
Anuken
dec5a2aaaf Minor campaign tweaks 2020-12-04 15:07:35 -05:00
Anuken
7b1c60c24f Testing tests 2020-12-04 12:23:02 -05:00
Anuken
8b8d990852 Testing tests 2020-12-04 12:16:47 -05:00
Anuken
6583cc0b5d Testing tests 2020-12-04 11:38:43 -05:00
Anuken
5c3ae425ae Display locked sectors / Core incinerate hint 2020-12-04 11:31:27 -05:00
Anuken
744b1b2037 Looking into test failure 2020-12-04 10:56:47 -05:00
Anuken
a313ca8a26 Checking if tests fail 2020-12-04 10:44:39 -05:00
Anuken
87204df3ee Merge remote-tracking branch 'origin/master' 2020-12-04 10:25:51 -05:00
Anuken
bc70c08820 Fixed #3756 2020-12-04 10:25:41 -05:00
Anuken
2c2828617f Create ISSUES.md 2020-12-04 10:03:54 -05:00
Diegator04
70c6cd2e87 Complete bundle_it
I compared the **@GioIacca9's bundle** with mine so I was able to notice **mistakes** and **missing translations** which I corrected. We worked together and we discussed about a suitable words and phrases in italian. Furthermore I added the **first version** of _unit's names_, we'll improve them in the future.
2020-12-04 13:55:22 +01:00
Angel_24
a8a629c5ef Update bundle_es.properties 2020-12-04 11:24:25 +01:00
Angel_24
8e6dd98a5a Update bundle_es.properties 2020-12-04 10:44:15 +01:00
YellOw139
39b8627a60 [Bundle][RO] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit 48c8357ff7
- Abilities should now be clear enough. Less of a mess.
- Typo fixes & various other improvements
2020-12-04 09:32:35 +02:00
Anuken
a451ad895c Slight sei buff 2020-12-03 20:29:58 -05:00
Anuken
d13b69c36f Sort community servers by ping 2020-12-03 16:49:30 -05:00
Angel_24
2af988d71f Update bundle_es.properties
Just one more little tweak
2020-12-03 19:51:51 +01:00
Angel_24
63318f9b67 Update bundle_es.properties
Minnor changes
2020-12-03 19:47:00 +01:00
Angel_24
7f032edd6f Update bundle_es.properties
added servers disclaimer
2020-12-03 19:37:12 +01:00
Angel_24
aff5b8bed6 Update bundle_es.properties
New hints translated
2020-12-03 19:28:01 +01:00
VitLogArx
22a50eec60 Update bundle_be.properties
Partially updated belarusian translation. Fixed some mistakes.
2020-12-03 21:00:41 +03:00
Anuken
d64f603e08 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-03 12:08:35 -05:00
Anuken
3d2c094056 arc 2020-12-03 12:08:31 -05:00
Anuken
64e99f613e Update bug_report.md 2020-12-03 11:08:00 -05:00
Anuken
51b4078288 Clean tests before running 2020-12-03 11:05:02 -05:00
Anuken
db8d099fcc arc 2020-12-03 10:29:19 -05:00
Anuken
002be46915 Updated miniaudio version 2020-12-03 10:28:57 -05:00
Anuken
9fa2691b02 Fixed campaign idle boss spoofing 2020-12-03 10:05:52 -05:00
Nikolass1000
df418c5a7d Small fix 2020-12-03 10:49:58 +01:00
Anuken
6686584003 Merge remote-tracking branch 'origin/master' 2020-12-02 18:01:49 -05:00
Anuken
78c8c57649 Made water unlocked again 2020-12-02 18:01:46 -05:00
Anuken
ca65fd31e5 Merge pull request #3728 from Vortetty/patch-2
Update surrealment to v6
2020-12-02 17:23:09 -05:00
Vortetty
e2109f2f56 Update servers_be.json 2020-12-02 14:20:55 -08:00
Vortetty
6b63cd7a46 Update servers_v6.json 2020-12-02 14:19:54 -08:00
Anuken
e19c857d74 Possible crash fix 2020-12-02 16:08:53 -05:00
Anuken
b18f418c61 Reduced easy sector difficulty 2020-12-02 14:48:42 -05:00
Anuken
12ee38476c Minor build fix 2020-12-02 14:35:03 -05:00
Anuken
48c8357ff7 Added community server disclaimer 2020-12-02 14:32:51 -05:00
Anuken
a0702559f3 Fixed #3725 2020-12-02 14:14:42 -05:00
Anuken
55db91e53e Cleanup 2020-12-02 13:53:49 -05:00
Anuken
a333fa3722 Added more hints 2020-12-02 13:40:49 -05:00
Anuken
5284750c6a Merge remote-tracking branch 'origin/master' 2020-12-02 13:02:35 -05:00
Anuken
9c616fd03b Possible fix for notched insets 2020-12-02 13:02:27 -05:00
Anuken
d4bee41103 Merge pull request #3722 from Quezler/patch-77
Fast forward boulder deconstruction
2020-12-02 12:58:58 -05:00
Patrick 'Quezler' Mounier
2e586c4403 Update ConstructBlock.java 2020-12-02 18:54:46 +01:00
Patrick 'Quezler' Mounier
129f21e3a9 Update Boulder.java 2020-12-02 18:01:40 +01:00
Patrick 'Quezler' Mounier
435f15a450 Update ConstructBlock.java 2020-12-02 18:00:50 +01:00
Patrick 'Quezler' Mounier
3eac8cb6ad Update Boulder.java 2020-12-02 17:59:20 +01:00
Patrick 'Quezler' Mounier
ea96bf2675 Update Block.java 2020-12-02 17:58:58 +01:00
Patrick 'Quezler' Mounier
e4c3664cc6 Update ConstructBlock.java 2020-12-02 16:36:07 +01:00
Patrick 'Quezler' Mounier
664cd6a3a0 Update ConstructBlock.java 2020-12-02 16:26:22 +01:00
Anuken
c26a9bd123 Merge pull request #3715 from Quezler/patch-75
Keep items inside reconstructor when construction booped
2020-12-02 10:05:51 -05:00
Anuken
5008573aa5 Merge pull request #3714 from Recessive/patch-7
Update servers_v6.json
2020-12-02 09:58:15 -05:00
Anuken
395f7193ea Merge remote-tracking branch 'origin/master' 2020-12-02 09:56:06 -05:00
Anuken
775e17a726 Fixed #3709 2020-12-02 09:56:02 -05:00
Anuken
900ec8db6a Merge pull request #3717 from Quezler/patch-76
Fixes massdriver typo
2020-12-02 09:54:37 -05:00
Anuken
e23a7c213c Merge pull request #3710 from joshuaptfan/master
Spellcheck English Steam achievements
2020-12-02 09:53:46 -05:00
Anuken
96513e4967 Merge pull request #3712 from MEEPofFaith/patch-1
Why is this protected in the first place?
2020-12-02 09:52:31 -05:00
Patrick 'Quezler' Mounier
b64df565a4 Update MassDriver.java 2020-12-02 14:09:19 +01:00
Patrick 'Quezler' Mounier
382e27e1e4 Populate prevBuild when deconstructting 2020-12-02 12:02:49 +01:00
Patrick 'Quezler' Mounier
0dd95e736d Add items back to reconstructor if it overwrote itself 2020-12-02 12:01:21 +01:00
Recessive
0ae6a33971 Update servers_v6.json
Add {AA} Hub and Campaign servers
2020-12-02 21:56:47 +11:00
MEEP of Faith
380c9ab113 Why is this protected in the first place? 2020-12-01 22:17:32 -08:00
joshuaptfan
1028ade80d Fix Poly unit description 2020-12-01 21:07:44 -08:00
joshuaptfan
a8e34381ef Spellcheck Steam store description 2020-12-01 20:37:00 -08:00
joshuaptfan
5f5987cef2 Spellcheck English Steam achievements 2020-12-01 20:20:37 -08:00
Anuken
430538ea7e Possible fix for "unsupported combination of formats" error 2020-12-01 18:17:57 -05:00
Anuken
ee966d1198 Removed requirements for optional inputs of blocks 2020-12-01 18:02:20 -05:00
Anuken
076363ac87 Merge pull request #3651 from Prosta4okua/patch-1
[Bundle][uk_UA]Update translation
2020-12-01 16:53:47 -05:00
Anuken
327442f6fe Merge pull request #3676 from Quezler/patch-74
Fix BlockForge progress bar & recenter payload
2020-12-01 16:53:13 -05:00
Anuken
c03400ccbc Merge pull request #3622 from genNAowl/distributors-come-on
Allow Distributors to Replace Conveyors
2020-12-01 16:46:09 -05:00
Anuken
a5ad45ff30 Fixed #3706 2020-12-01 15:57:20 -05:00
Anuken
3161e23285 Merge remote-tracking branch 'origin/master' 2020-12-01 15:36:53 -05:00
Anuken
e82ee227a5 1-bit stencil buffer, possible green line fix 2020-12-01 15:36:50 -05:00
Anuken
f8a859620d Merge pull request #3669 from Quezler/patch-73
per anuke's request
2020-12-01 14:02:03 -05:00
Anuken
30107db81e Fixed #3702 2020-12-01 13:01:38 -05:00
Anuken
05f7a15115 Merge remote-tracking branch 'origin/master' 2020-12-01 12:48:30 -05:00
Anuken
305e2642ba Minor bugfixes 2020-12-01 12:48:26 -05:00
Anuken
cb95059c3e Merge pull request #3699 from Somka000/patch-10
Update servers_v6.json
2020-12-01 11:40:00 -05:00
Somka000
20aa2384ea Update servers_v6.json
Sorry for second PR but domain is broke
2020-12-01 17:13:16 +01:00
Anuken
c5574d3ae0 Merge pull request #3683 from Recessive/patch-6
Update servers_v6.json
2020-12-01 10:26:57 -05:00
Recessive
45b43e7772 Update servers_v6.json
Added assimilation to {AA} server listing
2020-12-02 02:20:04 +11:00
Anuken
a461c184be Merge pull request #3691 from FruityPear/patch-4
Update server to v6
2020-12-01 09:48:46 -05:00
FruityPear
00e1cf7e9d Update server to v6
Also renaming domain from attack.pearkin.net
2020-12-01 09:46:18 -05:00
Anuken
86887f2ec1 Merge pull request #3689 from Somka000/patch-9
Update servers_v6.json
2020-12-01 09:44:28 -05:00
Somka000
bff0c2e6f3 Update servers_v6.json
New .pl server
2020-12-01 15:42:48 +01:00
Anuken
fcaf1e49cb Merge remote-tracking branch 'origin/master' 2020-12-01 09:39:34 -05:00
Anuken
448fef980b Community server fetch logging 2020-12-01 09:39:30 -05:00
Anuken
7832b6cafd Merge pull request #3688 from fuzzbuck/patch-5
mindustry.io from servers.json -> servers_v6.json
2020-12-01 09:31:05 -05:00
fuzzbuck
3a259d0001 Update servers_v6.json 2020-12-01 15:26:14 +01:00
Anuken
11168efffa Merge pull request #3524 from NgLamVN/master
Vietnamese translations
2020-12-01 09:24:22 -05:00
fuzzbuck
367da94e34 Update servers.json
no longer uses v5
2020-12-01 15:24:11 +01:00
Anuken
f8bce3cea0 Merge pull request #3687 from AmateurPotion/patch-13
Korean Translate Typo fix
2020-12-01 09:24:06 -05:00
EzLam
daed19e79b . 2020-12-01 21:12:35 +07:00
EzLam
0e565f00ff Merge branch 'master' of https://github.com/NgLamVN/Mindustry 2020-12-01 21:12:16 +07:00
EzLam
d4ab674b1c Whyy ?? 2020-12-01 21:11:19 +07:00
Ngọc Lam
884abb54e6 Nooooooo
NOOOOOOOOOOO
2020-12-01 20:57:59 +07:00
EzLam
026d3ef9ab Fix some typos 2020-12-01 20:53:25 +07:00
EzLam
0abf333168 Done. 2020-12-01 20:50:29 +07:00
EzLam
a124c2a2b4 rEaLdY fOr rEvIeW... 2020-12-01 20:46:54 +07:00
AmateurPotion
a43957a1fa Update bundle_ko.properties
Sorry. I think my mind ran away from home.
2020-12-01 22:44:03 +09:00
AmateurPotion
d0f3e413c6 Update bundle_ko.properties 2020-12-01 22:42:07 +09:00
AmateurPotion
469d5945b2 Typo 2020-12-01 22:40:41 +09:00
Anuken
c00228f960 Merge remote-tracking branch 'origin/master' 2020-12-01 08:39:21 -05:00
Anuken
ee28f4564b Final bugfixes 2020-12-01 08:39:16 -05:00
EzLam
5a8d0071df Yep. 2020-12-01 20:19:35 +07:00
Anuken
4c7b86196c Merge pull request #3681 from PetrGasparik/v118
[Bundle][cs] Czech translation - finishing touches for v6
2020-12-01 08:10:06 -05:00
Anuken
b946fd6a3b Merge pull request #3682 from GioIacca9/patch-13
fixes
2020-12-01 08:09:49 -05:00
EzLam
6f139641da 85% complete. 2020-12-01 17:12:58 +07:00
Ngọc Lam
c413be3ce0 Thanks for your help @JINODK
Update from lines 1286 to 1490
2020-12-01 17:02:35 +07:00
Ngọc Lam
19a804db91 Update bundle_vi.properties 2020-12-01 17:01:24 +07:00
JINODK
f6d35822fb Update from lines 1286 to 1490
"How to break your hand in 3 hours" in a nutshell 🥴
2020-12-01 16:56:29 +07:00
EzLam
8f1f015f3d Update contributors 2020-12-01 16:43:39 +07:00
EzLam
ed1b3ba608 Block.name.lol 2020-12-01 16:40:35 +07:00
Recessive
f3831eb9c5 Update servers_v6.json
Add {AA} V6 Plague to the server listing
2020-12-01 19:39:42 +11:00
Patrick 'Quezler' Mounier
1ed2b2eb2e Update core/src/mindustry/world/blocks/experimental/BlockForge.java 2020-12-01 09:28:22 +01:00
GioIacca9
039f5ef8db fixes 2020-12-01 08:27:39 +01:00
EzLam
be6b294087 Bruh. 2020-12-01 14:02:31 +07:00
Petr Gašparík
0ab593b7a5 Czech translation - finishing touches for v6 2020-12-01 08:00:26 +01:00
EzLam
67c35e12ae We dont need to translate this. 2020-12-01 13:36:18 +07:00
Ngọc Lam
7acc5e0858 72% complete 2020-12-01 13:16:45 +07:00
Prosta4okua
0553cafbe9 Update bundle_uk_UA.properties 2020-12-01 03:04:30 +02:00
Prosta4okua
9d78459d7d Підготовка до виходу 6.0 ч.1 2020-12-01 02:31:46 +02:00
Anuken
c0c5257ed8 пропустит
ь
2020-11-30 19:14:03 -05:00
Anuken
a476e3cf19 Merge remote-tracking branch 'origin/master' 2020-11-30 18:58:25 -05:00
Anuken
4c777fba5c Achievement fixes 2020-11-30 18:58:20 -05:00
Anuken
fe4497a4da Merge pull request #3541 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-11-30 18:50:03 -05:00
Felix Corvus
8843e49ac8 6 changed lines (@Prosta4okua)
- hint.desktopMove
- hint.respawn.mobile
- hint.placeDrill
- hint.placeDrill.mobile
- hint.placeConveyor
- hint.placeTurret
2020-12-01 02:34:27 +03:00
Anuken
a232839cfd Merge pull request #3616 from AmateurPotion/patch-12
Korean translation bundle
2020-11-30 18:30:56 -05:00
Anuken
5c483400e0 Merge pull request #3660 from Xasmedy/patch-1
Update servers_v6.json
2020-11-30 18:18:15 -05:00
Anuken
3a05a2b0ef Merge pull request #3631 from Quick-korkc/patch-13
Update Contributors
2020-11-30 18:14:56 -05:00
Anuken
26e90c99d3 Merge branch 'master' into patch-13 2020-11-30 18:14:51 -05:00
Anuken
fe59031fce Merge pull request #3674 from GioIacca9/patch-12
v6 Italian bundle
2020-11-30 18:13:16 -05:00
Anuken
56e326ab1b Merge pull request #3671 from Nikolass1000/patch-2
Polish complete translation.
2020-11-30 18:12:44 -05:00
Anuken
1a3af01b24 Merge pull request #3642 from laohuaji233/patch-42
Update bundle_zh_CN.properties[Unfinished]
2020-11-30 18:11:50 -05:00
Anuken
7954d7e4e9 Merge pull request #3618 from L0615T1C5-216AC-9437/patch-2
Add CN pvp Server to Community Server List
2020-11-30 18:11:43 -05:00
Anuken
7a0bac95a5 Merge pull request #3615 from Catchears/german-v6
Final v6 german translation
2020-11-30 18:11:24 -05:00
Anuken
625486ade9 Merge pull request #3584 from Lapis256/master
update bundle_ja.properties
2020-11-30 18:11:06 -05:00
Anuken
6a33f41fb4 Merge pull request #3554 from Nikolass1000/patch-3
Update contributors
2020-11-30 18:10:40 -05:00
Anuken
38f722e0b6 Merge branch 'master' into patch-3 2020-11-30 18:10:28 -05:00
Anuken
9c773f48ee Merge pull request #3548 from simba-fs/master
modify zh-TW translation
2020-11-30 18:10:07 -05:00
Anuken
d142777fca Merge pull request #3547 from PetrGasparik/v117
[Bundle][cs] Czech translation ready for 6.0
2020-11-30 18:09:57 -05:00
Anuken
2332595f2d Merge pull request #3545 from YellOw139/patch-1
[Bundle][RO] Translation Update
2020-11-30 18:09:36 -05:00
Anuken
cdb1003133 Merge pull request #3443 from DaGamerFiles/patch-4
[Bundle][ID] Updated translation
2020-11-30 18:09:14 -05:00
Vanguard
ca2dabe769 КОММИТ МНЕ В РОУТЕР 2020-12-01 02:07:36 +03:00
Felix Corvus
0c1817eb12 2 changed lines; 9 translated lines
Changed:

- hint.placeTurret
- hint.breaking.mobile

Translated:

- hint.research
- hint.research.mobile
- hint.unitControl
- hint.unitControl.mobile
- hint.launch
- hint.launch.mobile
- hint.schematicSelect
- hint.conveyorPathfind
- hint.conveyorPathfind.mobile
2020-12-01 01:50:10 +03:00
Anuken
c0c8235e3d Merge remote-tracking branch 'origin/master' 2020-11-30 17:49:24 -05:00
Anuken
d868ff81bf Dependency resolution fix 2020-11-30 17:49:20 -05:00
Anuken
16f64a90a8 Merge pull request #3675 from Remint32/patch-4
typo
2020-11-30 17:32:08 -05:00
Felix Corvus
8dae9babab not typo 2020-12-01 01:27:34 +03:00
Anuken
d33cea6003 Merge remote-tracking branch 'origin/master' 2020-11-30 17:12:33 -05:00
Anuken
9870098457 Updated Steam meta / Fixed #3673 2020-11-30 17:12:29 -05:00
Patrick 'Quezler' Mounier
4102c380d2 Update BlockForge.java 2020-11-30 22:47:26 +01:00
Felix Corvus
44204db2bb typo 2020-12-01 00:30:52 +03:00
GioIacca9
a87e58db93 v6 Italian bundle 2020-11-30 22:16:13 +01:00
Petr Gašparík
082a43da35 Czech translation up to date with final beta 2020-11-30 21:35:14 +01:00
Petr Gašparík
ca35b113f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-30 21:29:13 +01:00
Nikolass1000
f23e63decf Polish complete translation. 2020-11-30 19:44:51 +01:00
Anuken
c09b1e0d6e Merge pull request #3562 from skykatik/patch-10
[Typo] comiting changes
2020-11-30 12:58:55 -05:00
Anuken
3b9f775f82 Merge pull request #3535 from Nikolass1000/patch-2
Update bundle_pl.properties
2020-11-30 12:56:59 -05:00
Anuken
af122a76a4 Merge remote-tracking branch 'origin/master' 2020-11-30 12:52:15 -05:00
Anuken
5c89fa2d2b Achievement cleanup 2020-11-30 12:52:10 -05:00
Patrick 'Quezler' Mounier
bbee3ae9cd Update BuildingComp.java 2020-11-30 18:36:57 +01:00
Anuken
e76dee8cbe Merge pull request #3665 from Quezler/patch-72
Fix configuring buildings with blocks
2020-11-30 12:32:46 -05:00
AmateurPotion
dd4b130c7a Update bundle_ko.properties 2020-12-01 01:41:21 +09:00
Anuken
639702ae1a Fixed unit tests 2020-11-30 11:12:09 -05:00
Patrick 'Quezler' Mounier
9df4eac2f8 Update BuildingComp.java 2020-11-30 16:36:10 +01:00
Anuken
18b0cd4e99 Merge remote-tracking branch 'origin/master' 2020-11-30 10:15:58 -05:00
Anuken
371a14af87 Inlined Time.time 2020-11-30 10:15:22 -05:00
Anuken
fc85aae500 Merge pull request #3662 from Quezler/patch-71
Fixes #3661
2020-11-30 09:44:01 -05:00
AmateurPotion
051a3a07c3 Update bundle_ko.properties
Real Final
2020-11-30 22:59:38 +09:00
AmateurPotion
a4a8470064 Update bundle_ko.properties 2020-11-30 22:42:08 +09:00
Patrick 'Quezler' Mounier
5ba99ecb42 Fixed #3661 2020-11-30 14:21:18 +01:00
EzLam
f67f09934e Description. 2020-11-30 18:50:16 +07:00
EzLam
149ce3bccf "Game Over": It doesnt mean you lose the game. 2020-11-30 17:20:05 +07:00
YellOw139
fb580326b2 Easier reading for the monolingual 2020-11-30 11:53:52 +02:00
EzLam
00a25f31b8 Description ... 2020-11-30 16:48:23 +07:00
Ngọc Lam
e535f94832 Update. 2020-11-30 15:58:43 +07:00
Xasmedy
04169f6bcb Update servers_v6.json
Adding mindustry.ddns.net servers.
2020-11-30 09:33:17 +01:00
老滑稽
4f3e353b75 Update bundle_zh_CN.properties 2020-11-30 12:45:27 +08:00
Anuken
c41dfa46aa Fixed #3657 2020-11-29 19:41:10 -05:00
Anuken
ba9bc472e8 Merge remote-tracking branch 'origin/master' 2020-11-29 16:34:35 -05:00
Anuken
a7c18fc598 Fixed #3656 2020-11-29 16:34:31 -05:00
Anuken
67169a2ffc Merge pull request #3655 from Quezler/patch-70
display the repair field healed effect at the healed unit(s)
2020-11-29 13:59:57 -05:00
Anuken
2a9f362e15 Fixed #3654 2020-11-29 13:59:09 -05:00
Patrick 'Quezler' Mounier
80f027471c Update RepairFieldAbility.java 2020-11-29 19:35:49 +01:00
Anuken
682c1692df Compilation fix 2020-11-29 12:15:22 -05:00
lapis256
da97d1e1eb update bundle_ja.properties 2020-11-30 02:14:53 +09:00
Anuken
979e39f588 Added unit to BlockBuildBeginEvent 2020-11-29 12:14:46 -05:00
lapis256
4fb97b60a9 update bundle_ja.properties 2020-11-30 01:54:43 +09:00
Anuken
bc114dfefc Version is "release" for real now 2020-11-29 11:37:02 -05:00
Anuken
29be8176c1 Fixed some crashes 2020-11-29 11:08:12 -05:00
老滑稽
d322de8686 Update bundle_zh_CN.properties 2020-11-29 23:55:37 +08:00
Anuken
67c6e0179f Merge remote-tracking branch 'origin/master' 2020-11-29 10:37:11 -05:00
Anuken
e3f2966db3 Nevermind, reverting to beta for last pre-release 2020-11-29 10:37:07 -05:00
Anuken
9e53b3b7e6 Update bug_report.md 2020-11-29 10:33:51 -05:00
Anuken
8f186a16b3 Build beginPlace+Break access tracking / Instant rotation 2020-11-29 10:12:24 -05:00
老滑稽
532aa88dca Update bundle_zh_CN.properties 2020-11-29 23:00:45 +08:00
Anuken
9a3b21d77a Fixed #3650 2020-11-29 09:54:52 -05:00
老滑稽
b488cd8dff Update bundle_zh_CN.properties 2020-11-29 22:48:14 +08:00
Prosta4okua
06faa368cc Update bundle_uk_UA.properties 2020-11-29 14:06:41 +02:00
AmateurPotion
118b438519 Update bundle_ko.properties 2020-11-29 19:10:50 +09:00
AmateurPotion
a7a3b94caf Update bundle_ko.properties 2020-11-29 19:07:39 +09:00
AmateurPotion
a1c26a610c Update bundle_ko.properties 2020-11-29 18:57:34 +09:00
EzLam
8f58f40b1a Ready for review ? 2020-11-29 16:53:22 +07:00
AmateurPotion
856a8c11aa Update bundle_ko.properties 2020-11-29 18:40:04 +09:00
EzLam
7bab4d67e1 vietnamese is harder. 2020-11-29 16:30:38 +07:00
EzLam
3a2514e937 That why English is HARD. 2020-11-29 16:18:33 +07:00
Anuken
23fc86fac1 Updated wiki links 2020-11-28 23:59:56 -05:00
Anuken
3d6fd8a351 De-abstracted weather 2020-11-28 23:23:39 -05:00
Ngọc Lam
66b540988b happy birthday to me :) 2020-11-29 11:02:00 +07:00
Anuken
3c51d82a1a Fixed #3648 2020-11-28 22:45:36 -05:00
老滑稽
d6c5eb121c Update bundle_zh_CN.properties 2020-11-29 11:03:36 +08:00
Anuken
b63501b1c7 Core overfill bugfix 2020-11-28 21:51:26 -05:00
老滑稽
25015a61ae Update bundle_zh_CN.properties 2020-11-29 10:36:28 +08:00
EzLam
c2d808b921 happy birthday to me ._. 2020-11-29 08:51:55 +07:00
Anuken
810238d0f9 Cleanup 2020-11-28 20:30:43 -05:00
Anuken
bb16d1c613 Removed Abstract block classes for better code inspection 2020-11-28 19:12:27 -05:00
Anuken
b8cb17c0c5 Campaign production fixes 2020-11-28 15:08:53 -05:00
YellOw139
f4c6870ee9 And so ability.unitspawn works thanks new wiki 2020-11-28 21:18:00 +02:00
Anuken
9ca3cd49b8 Merge remote-tracking branch 'origin/master' 2020-11-28 13:57:23 -05:00
Anuken
e6544b73db Switching modifier from beta to release 2020-11-28 13:57:19 -05:00
Anuken
2e30cd31c2 Merge pull request #3646 from Slava0135/unit-payload
Unit Payload spawning units on block removing/destruction
2020-11-28 13:56:45 -05:00
slava0135
e6078bd4f6 oopsie x4 2020-11-28 21:49:59 +03:00
YellOw139
340efc3298 Typo 2020-11-28 20:49:33 +02:00
slava0135
b0477394e6 oopsie x3 2020-11-28 21:45:42 +03:00
slava0135
699750762f removing unnecessary stuff 2020-11-28 21:38:50 +03:00
slava0135
ee3348d160 oopsie x2 2020-11-28 21:10:12 +03:00
slava0135
6dc2486ce0 oopsie 2020-11-28 21:06:20 +03:00
slava0135
724a0018b8 unit payload improvements 2020-11-28 20:39:09 +03:00
老滑稽
19e03e665e Update bundle_zh_CN.properties 2020-11-29 00:59:15 +08:00
slava0135
3b20c68a6f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-28 19:53:04 +03:00
老滑稽
3712a90f90 Update bundle_zh_CN.properties 2020-11-29 00:35:50 +08:00
Anuken
98206446e6 Merge remote-tracking branch 'origin/master' 2020-11-28 11:31:14 -05:00
Anuken
6e62859d0e Fixed #3644 2020-11-28 11:31:07 -05:00
Felix Corvus
1e8f49e45a 1 line changed (@Prosta4okua)
indev.campaign
2020-11-28 19:09:21 +03:00
Felix Corvus
c188e23d06 7 translated lines
- hint.placeDrill
- hint.placeDrill.mobile
- hint.placeConveyor
- hint.placeConveyor.mobile
- hint.placeTurret
- hint.breaking
- hint.breaking.mobile
2020-11-28 19:07:02 +03:00
老滑稽
8b5acefdfe Update bundle_zh_CN.properties 2020-11-29 00:05:24 +08:00
Catchears
cff957feaf Merge branch 'master' into german-v6 2020-11-28 16:53:33 +01:00
Wiki Updater
4deb8fd626 resolve merge conflict 2020-11-28 16:49:24 +01:00
Anuken
1f1701f1d6 Update README.md 2020-11-28 10:44:14 -05:00
Anuken
e6c99e0c6d Update README.md 2020-11-28 10:42:50 -05:00
Anuken
e6c15b526a Merge pull request #3620 from AydenRennaker/patch-8
Update servers_v6.json
2020-11-28 09:50:22 -05:00
Anuken
4de516b527 Merge pull request #3639 from LeoSko/patch-2
Update servers_v6.json
2020-11-28 09:50:02 -05:00
slava0135
815a483d2c typo in Fires:
/** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
2020-11-28 17:49:39 +03:00
Anuken
2816aeb6e9 Merge pull request #3451 from Angel-24/patch-2
[Bundle][ES] Translation update
2020-11-28 09:46:30 -05:00
Anuken
f40e523764 Merge pull request #3567 from CPXMC/patch-6
Update bundle_zh_CN.properties
2020-11-28 09:46:23 -05:00
Anuken
8a424111f0 Fixed #3633 2020-11-28 09:43:35 -05:00
Felix Corvus
efeb29f47a 4 changed lines
- unit.nova.description
- unit.pulsar.description
- unit.quasar.description
- unit.vela.description
2020-11-28 17:13:59 +03:00
Wiki Updater
7a81fde64e changes from Shawak 2020-11-28 14:36:55 +01:00
Leonid Skorospelov
47922834f9 Update servers_v6.json
Ranked 1v1 gradually moving to v6
2020-11-28 14:16:30 +02:00
Nikolass1000
2d66790aab Complete 2020-11-28 12:18:13 +01:00
AmateurPotion
b7b4dc8f43 Update bundle_ko.properties
2
2020-11-28 19:54:37 +09:00
EzLam
69960017d3 wwwhat ? 2020-11-28 17:28:31 +07:00
EzLam
b1a4d51210 That why english is hard. 2020-11-28 17:07:00 +07:00
Wiki Updater
1d8fbf7aa9 final changes 2020-11-28 10:50:35 +01:00
YellOw139
2c0884ed46 Fixes 2020-11-28 11:21:46 +02:00
Leonwang4234
4cda52caf7 size >= other.size 2020-11-27 21:15:33 -08:00
EzLam
9c54792341 bruh 2020-11-28 12:10:33 +07:00
NgLamVN
56b947fb9e ... 2020-11-28 11:30:35 +07:00
Quick-Korc
eb21ce24b6 Update Contributors
Already ask Anuke about this
2020-11-28 06:29:22 +07:00
Anuken
2a6b0fd0ce Fixed vaults not counting withdrawn items 2020-11-27 18:09:47 -05:00
Anuken
47e622dee3 (more) Campaign balancing 2020-11-27 18:07:10 -05:00
Anuken
99125e9218 Merge remote-tracking branch 'origin/master' 2020-11-27 17:37:28 -05:00
Anuken
66918f0322 Campaign balancing 2020-11-27 17:37:22 -05:00
Wiki Updater
6634e6f8a5 ...
I think that it would be fair to add me into the list of translators and contributors as I've somehow editied over 800 lines of the german translation. If you don't think I should be added to the list, say that in a comment.
2020-11-27 23:19:56 +01:00
Wiki Updater
525643cb17 unit descriptions 2020-11-27 23:10:58 +01:00
Anuken
b8a2c609cb Merge pull request #3629 from Catchears/typo
typo
2020-11-27 16:19:16 -05:00
Wiki Updater
968277477a typo 2020-11-27 22:18:08 +01:00
Wiki Updater
4fbfb50380 more translations 2020-11-27 21:43:58 +01:00
Anuken
d06b32c20b Added boss to sector damage calculations 2020-11-27 14:18:09 -05:00
Felix Corvus
805412f812 1 new line; 1 line changed
New:

- hint.guardian

Changed:

- hint.command
2020-11-27 21:17:23 +03:00
Felix Corvus
de4b88013d 3 new lines
- sector.extractionOutpost.description
- sector.impact0078.description
- sector.planetaryTerminal.description
2020-11-27 21:13:08 +03:00
Anuken
525dc0cd7e Added bosses for sectors missing them 2020-11-27 12:35:20 -05:00
Anuken
8b6fc7f3ac Fixed #3628 2020-11-27 12:27:56 -05:00
Anuken
8dd66fb942 Campaign tweaks 2020-11-27 11:56:01 -05:00
Angel_24
7e5c69a107 Update bundle_es.properties 2020-11-27 13:07:38 +01:00
Lapis
c8357c7b84 Merge pull request #1 from Lapis256/Lapis256-patch-1
Update bundle_ja.properties
2020-11-27 20:56:32 +09:00
EzLam
f7170dc39a Fix some typos. 2020-11-27 17:41:49 +07:00
Angel_24
e4a95ab4c4 Merge pull request #2 from Angel-24/master
Master
2020-11-27 10:21:25 +01:00
Angel_24
40dd3d5677 Update bundle_es.properties 2020-11-27 10:07:38 +01:00
NgLamVN
3aabfaf14b 60% Complete. 2020-11-27 15:28:21 +07:00
EzLam
2cc0ae3d81 What "unit" mean ?? 2020-11-27 15:24:55 +07:00
Leonwang4234
ab8a381ad9 Lol how did it compile without the @Override 2020-11-26 23:33:18 -08:00
Leonwang4234
ced6369b25 Update Router.java 2020-11-26 23:28:05 -08:00
Thomas Widyantoko
c545e03852 legacy research discard fix 2020-11-27 11:47:05 +07:00
Thomas Widyantoko
cf16983b34 another new lines and fixes
legacy research, Guardian = Penjaga, Purpose = Kegunaan, reconnecting, etc.
2020-11-27 11:34:53 +07:00
Lapis
0d4c28daf2 Update bundle_ja.properties 2020-11-27 13:27:09 +09:00
Anuken
e39eceee28 Allow research even if sector was attacked after capture 2020-11-26 21:48:45 -05:00
AydenRennaker
ca29909bec Update servers_v6.json
Add Atanner Gaming server back to list. 

Updates are looking good :)
2020-11-26 18:32:31 -08:00
Anuken
869c329fbf Fixed Nuclear Complex gen / Increased damage simulation harshness 2020-11-26 21:29:22 -05:00
Anuken
c8b425116e Fixed Impact0078 ore gen / Misc campaign fixes 2020-11-26 20:46:17 -05:00
Felix Corvus
fe2daa9327 2 changed lines
- sector.biomassFacility.description
- sector.windsweptIslands.description
2020-11-27 04:25:09 +03:00
Felix Corvus
aeaeb87fbb 2 new lines
- sector.biomassFacility.description
- sector.windsweptIslands.description
2020-11-27 04:21:22 +03:00
Anuken
0a290d2e10 Auto-rebuilding of broken attack sector blocks on restart 2020-11-26 20:19:13 -05:00
Anuken
9863cbc991 Disabled unit explosion team damage 2020-11-26 19:30:49 -05:00
Anuken
91c50ae126 Disabled explosion fires for item flammability <= 1
coming soon: spore bombing?
2020-11-26 19:25:26 -05:00
Felix Corvus
ef62bb49bc 5 new lines; 1 line changed; 1 line removed
New:

- available
- research.legacy
- research.load
- research.discard
- reconnecting

Changed:

- indev.campaign

Removed:

- indev.popup
2020-11-27 03:13:28 +03:00
Anuken
dae46ceb6d Campaign bugfixes / Balancing 2020-11-26 18:53:20 -05:00
Anuken
6b3919e8f7 Added Call#setItem 2020-11-26 16:49:01 -05:00
Wiki Updater
ed89a70cbc hints + sector descriptions in german 2020-11-26 21:39:14 +01:00
Anuken
20637fa358 Merge remote-tracking branch 'origin/master' 2020-11-26 15:32:01 -05:00
Anuken
1d8ec9abd9 Campaign bugfixes 2020-11-26 15:31:58 -05:00
Anuken
d3f58c0e83 Campaign bugfixes 2020-11-26 15:31:19 -05:00
Anuken
84474040c0 Fungal Pass map fixes 2020-11-26 14:24:35 -05:00
L0615T1C5-216AC-9437
18d7f8ddfb Add CN pvp Server to Community Server List 2020-11-26 14:21:52 -05:00
YellOw139
ef63c5073a Legacy prompts 2020-11-26 21:11:55 +02:00
Anuken
3fe4ae38b6 Misc cleanup 2020-11-26 12:53:19 -05:00
Petr Gašparík
0b515395e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-26 17:48:24 +01:00
AmateurPotion
22116314c5 1st translation bundle
Please do not merge yet. Not all translated.
2020-11-27 01:32:31 +09:00
Wiki Updater
35da950986 german translation 2020-11-26 16:41:46 +01:00
Anuken
465219540c Added prompt for loading legacy research data 2020-11-26 10:22:01 -05:00
Angel_24
0e354dbf23 Merge pull request #1 from Angel-24/patch-2
Patch 2
2020-11-26 10:46:59 +01:00
Angel_24
d1563ee55e Merge branch 'master' into patch-2 2020-11-26 10:43:13 +01:00
EzLam
49f4b1fd67 Merge branch 'master' of https://github.com/NgLamVN/Mindustry 2020-11-26 15:47:55 +07:00
EzLam
ba6d40cc22 to be continued ... 2020-11-26 15:47:30 +07:00
NgLamVN
dc15c9a7e4 To be continued ... 2020-11-26 15:42:27 +07:00
EzLam
27e22a84d3 to be continued ... 2020-11-26 15:40:35 +07:00
Petr Gašparík
33c3d587dd Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-26 09:11:09 +01:00
Angel_24
fa3a19d766 Update bundle_es.properties 2020-11-26 08:52:46 +01:00
Angel_24
0d4add667f Update bundle_es.properties 2020-11-26 08:49:44 +01:00
Angel_24
7f214f1343 Update bundle_es.properties 2020-11-26 08:47:11 +01:00
Anuken
e1ddf115e0 Merged turret types 2020-11-25 20:41:38 -05:00
Anuken
56f1d0548e Merge remote-tracking branch 'origin/master' 2020-11-25 20:23:24 -05:00
Anuken
38471d68d7 Fixed Salt Flats being deadlocked 2020-11-25 20:23:17 -05:00
Anuken
17a571f22a Merge pull request #3604 from sk7725/patch-30
[KO]Quick Fix
2020-11-25 20:06:10 -05:00
Sunny Kim
dd9c3fc8d6 Update bundle_ko.properties 2020-11-26 10:01:15 +09:00
Sunny Kim
a70e29127b [KO]quick patch 2020-11-26 09:59:07 +09:00
Anuken
6be2b6021b Merge pull request #3603 from skykatik/patch-12
Some typos
2020-11-25 18:28:30 -05:00
Skat
488147759a Some typos 2020-11-26 02:04:08 +03:00
Anuken
9a7d359626 Merge pull request #3579 from Quezler/patch-68
Remove stray newline
2020-11-25 17:49:40 -05:00
Anuken
0437d50a5c Merge pull request #3598 from summetdev/patch-8
Remove unused imports
2020-11-25 17:49:24 -05:00
Anuken
f49f151901 Merge pull request #3601 from genNAowl/projector-block-group
Add Projectors Blockgroup
2020-11-25 17:27:56 -05:00
Angel_24
245e5d515a Update contributors 2020-11-25 23:22:17 +01:00
Leonwang4234
2b8c11c451 projectors blockgroup 2020-11-25 14:19:56 -08:00
Anuken
11d864f2b5 Merge remote-tracking branch 'origin/master' 2020-11-25 16:25:43 -05:00
Anuken
977b55bf32 Testing BE builds 2020-11-25 16:25:39 -05:00
Anuken
b06be81f1e Merge pull request #3600 from summetdev/patch-10
GitHub Actions: Manual Triggers
2020-11-25 16:24:33 -05:00
Anuken
93313664f0 Testing BE builds 2020-11-25 16:14:39 -05:00
Antsiferov Andrew
25cb2b0abf Add workflow_dispatch event 2020-11-26 00:09:17 +03:00
Anuken
b841af3a48 Testing BE builds 2020-11-25 16:09:11 -05:00
Anuken
709f43b83c Testing BE builds 2020-11-25 16:00:35 -05:00
Anuken
aabc094dd9 Testing BE builds 2020-11-25 15:47:44 -05:00
Anuken
58acc0a970 Merge remote-tracking branch 'origin/master' 2020-11-25 15:42:56 -05:00
Anuken
c874089f27 Bugfixes 2020-11-25 15:42:51 -05:00
YellOw139
91b05e4789 Reconnecting 2020-11-25 22:29:32 +02:00
Angel_24
1cc73a4077 Finished Spanish Translation, for now... 2020-11-25 21:26:24 +01:00
Antsiferov Andrew
4ac26d86f5 Remove unused imports 2020-11-25 20:04:32 +00:00
Angel_24
a693289867 Update bundle_es.properties 2020-11-25 20:57:32 +01:00
Anuken
010e5341dc Merge pull request #3596 from Catchears/ai
Fix ai schematics with power weapons and steam gens
2020-11-25 14:14:28 -05:00
Wiki Updater
51790e0bf9 fix ai schematics with power weapons and steam gens 2020-11-25 19:52:36 +01:00
Petr Gašparík
fd80cbcae5 Update up to b002d8b 2020-11-25 18:42:20 +01:00
Petr Gašparík
45bb6fa2ee Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-25 18:20:42 +01:00
Anuken
40b67349d9 Fixed quotes 2020-11-25 11:56:10 -05:00
Anuken
735cb74483 Merge remote-tracking branch 'origin/master' 2020-11-25 11:15:50 -05:00
Anuken
bc55e43def Fixed #3591 2020-11-25 11:15:46 -05:00
Anuken
084d7e8355 Merge pull request #3583 from Quezler/patch-69
automatic reconnect
2020-11-25 11:14:04 -05:00
Anuken
22e60612ac Merge remote-tracking branch 'origin/master' 2020-11-25 11:09:33 -05:00
Anuken
b271c4be32 Fixed deploy CI, again 2020-11-25 11:09:29 -05:00
Patrick 'Quezler' Mounier
f26b3358ef Update core/src/mindustry/ui/dialogs/JoinDialog.java
Co-authored-by: Anuken <arnukren@gmail.com>
2020-11-25 17:08:03 +01:00
Patrick 'Quezler' Mounier
3d6390a76a Set the ping to null when canceling manually as well 2020-11-25 16:51:57 +01:00
Patrick 'Quezler' Mounier
ff20928bec Anukify reconnect logic 2020-11-25 16:49:36 +01:00
Anuken
59387389a4 Merge pull request #3563 from skykatik/patch-11
Deleted unnecessary DateTimeFormatter declaration
2020-11-25 10:33:46 -05:00
Anuken
fb200c6d11 arc 2020-11-25 10:16:40 -05:00
Anuken
8418770bbf Merge remote-tracking branch 'origin/master' 2020-11-25 10:15:22 -05:00
Anuken
eaa7b04c3d Fixed CI / Fixed exponentially increasing broken blocks 2020-11-25 10:15:14 -05:00
Anuken
6131ef23fc Merge pull request #3578 from Quezler/patch-67
Remove unused import
2020-11-25 09:36:41 -05:00
Angel_24
1467a3a7fd Update bundle_es.properties 2020-11-25 14:59:07 +01:00
EzLam
f5023aa846 Update bundle_vi.properties 2020-11-25 19:22:28 +07:00
EzLam
d10fd8e738 fix typos. 2020-11-25 17:46:38 +07:00
lapis256
8ca833f753 update bundle_ja.properties 2020-11-25 18:50:44 +09:00
Patrick 'Quezler' Mounier
b002d8b446 Update bundle.properties 2020-11-25 10:42:13 +01:00
Patrick 'Quezler' Mounier
f5e06cca54 Update NetClient.java 2020-11-25 10:41:41 +01:00
Patrick 'Quezler' Mounier
642b877ab0 Update JoinDialog.java 2020-11-25 10:40:42 +01:00
Angel_24
2a618a6600 Update bundle_es.properties 2020-11-25 10:36:48 +01:00
Angel_24
fa48f1b2e0 Merge branch 'master' into patch-2 2020-11-25 10:26:11 +01:00
Angel_24
69063e9dc5 Update contributors 2020-11-25 10:23:07 +01:00
NgLamVN
c2bedc0210 Update 2020-11-25 16:09:41 +07:00
EzLam
103f5a65b6 LOL I forgot to do that :v 2020-11-25 15:42:30 +07:00
YellOw139
e0f2c2f46f Sector descriptions: additions and revisions
Romanian is gonna hit stable soon.
2020-11-25 10:40:02 +02:00
Patrick 'Quezler' Mounier
8ee3f2b2e6 Remove stray newline 2020-11-25 09:38:04 +01:00
EzLam
7697a21003 ... 2020-11-25 15:36:45 +07:00
Patrick 'Quezler' Mounier
40bf0741f0 Remove unused import 2020-11-25 09:36:12 +01:00
Thomas Widyantoko
d13c407846 Merge pull request #11 from Quick-korkc/patch-12
New hint translate and other
2020-11-25 15:33:37 +07:00
Quick-Korc
43fea03996 New hint translate and other 2020-11-25 15:24:35 +07:00
Nikolass1000
87da58df69 Update bundle_pl.properties 2020-11-25 09:19:35 +01:00
EzLam
72a453654e ... 2020-11-25 14:56:15 +07:00
EzLam
25c31c5250 Update to lastest main bundle. 2020-11-25 14:30:53 +07:00
Thomas Widyantoko
fac1bccda1 various fixes 2020-11-25 14:16:00 +07:00
Thomas Widyantoko
2f465493f0 Merge pull request from Quick-korkc
New Sector description Translation
2020-11-25 13:56:01 +07:00
Anuken
6633b07fb2 Merge pull request #3561 from Volas171/patch-2
Update contributors
2020-11-24 18:55:00 -05:00
Quick-Korc
b285165818 New Sector description Translation 2020-11-25 06:31:16 +07:00
Volas171
e65971db47 h 2020-11-24 18:30:59 -05:00
Anuken
5fd66d38bb Fixed #3573 2020-11-24 18:15:40 -05:00
Anuken
15f33b45c7 Salt Flats should probably require additive reconstructors 2020-11-24 18:12:45 -05:00
Anuken
17e66f1008 Final campaign tweaks 2020-11-24 17:17:55 -05:00
Anuken
bcaf5e4c3d Campaign balance / Smarter power node placement 2020-11-24 16:33:36 -05:00
YellOw139
ea653bf5c3 Finished (for now) 2020-11-24 20:48:40 +02:00
Anuken
6fd36d97f0 Balancing 2020-11-24 12:53:55 -05:00
Anuken
61bec243dc Campaign balance 2020-11-24 12:35:04 -05:00
Anuken
7d43856735 Bugfixes 2020-11-24 10:23:28 -05:00
CPXMC
9f8e1b93f1 Update bundle_zh_CN.properties
单位,方块,物品的简介翻译交给你们了(滑稽
2020-11-24 22:02:28 +08:00
Anuken
058b2ddfce Fixed #3565 2020-11-24 09:00:34 -05:00
YellOw139
7a59c7bc24 translation checkpoint 2020-11-24 13:22:42 +02:00
Skat
1637360952 Deleted unnecessary DateTimeFormatter declaration 2020-11-24 13:00:08 +03:00
Angel_24
38f4154d18 Update bundle_es.properties 2020-11-24 10:47:35 +01:00
Angel_24
7ffbb93ba7 Update contributors 2020-11-24 10:30:33 +01:00
Angel_24
8004b6ce1d Update bundle_es.properties 2020-11-24 09:39:08 +01:00
EzLam
77ba760a94 Update to lastest main bundle :) 2020-11-24 15:36:37 +07:00
Skat
12d045c631 [Typo] comiting changes* 2020-11-24 09:34:29 +03:00
Volas171
97254a6672 Update contributors 2020-11-23 22:27:08 -05:00
Thomas Widyantoko
8e7382b0c0 Merge pull request from Quick-korkc
Hint translate
2020-11-24 09:25:51 +07:00
Anuken
2282cb89b1 Fixed sector damage calculations / Campaign balance 2020-11-23 18:09:20 -05:00
Anuken
06929ee8f3 Fixed boss hint not disappearing 2020-11-23 15:47:15 -05:00
Anuken
ec19381c4e Fixed campaign bases having ridiculous wall tiers 2020-11-23 15:41:10 -05:00
Felix Corvus
2144ac57c4 1 line changed
sectors.survives
2020-11-23 22:58:24 +03:00
Angel_24
7c79ee469e Update contributors 2020-11-23 20:11:27 +01:00
Angel_24
741e6b55b0 Update contributors 2020-11-23 20:09:33 +01:00
Angel_24
6f75116197 Update bundle_es.properties 2020-11-23 20:06:37 +01:00
Anuken
4a52392ce9 Added hint about guards & armor 2020-11-23 13:09:42 -05:00
Nikolass1000
45b355508d Update contributors 2020-11-23 18:56:06 +01:00
simba-fs
1cfa5db611 modify zh-TW translation 2020-11-23 23:48:37 +08:00
Anuken
dcbe06229c Campaign fixes & balance 2020-11-23 10:36:41 -05:00
Petr Gašparík
ab66247f8a Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-23 15:39:39 +01:00
Felix Corvus
6c87035a72 9 translated lines
- hint.skip
- hint.desktopMove
- hint.zoom
- hint.mine
- hint.desktopShoot
- hint.depositItems
- hint.respawn
- hint.respawn.mobile
- hint.desktopPause
2020-11-23 17:37:03 +03:00
Anuken
075be1a862 Fixed #3540 / Fixed #3544 / Fixed #3542 2020-11-23 09:12:36 -05:00
Petr Gašparík
370fd149cd Czech translation for future v117 2020-11-23 14:47:08 +01:00
Quick-Korc
849dd7e2eb Hint translate 2020-11-23 20:32:22 +07:00
Angel_24
143be734c5 Update bundle_es.properties 2020-11-23 14:13:23 +01:00
YellOw139
23c33d87c1 Update bundle_ro.properties
This is not ready, hence will be a draft. ea377c6f16 still unfinished. Do not merge as-is. It is unfinished and untested.

This is a rushed submission. I did not want to lose my progress; don't have time to finish it right now.
2020-11-23 14:56:18 +02:00
Thomas Widyantoko
01a68c210c rearranging 2020-11-23 19:31:01 +07:00
EzLam
fe01282421 re-trans 2020-11-23 18:06:06 +07:00
EzLam
226ff9aa03 re trans 2020-11-23 17:33:18 +07:00
Angel_24
ad6a3bf150 Update bundle_es.properties 2020-11-23 11:29:07 +01:00
Felix Corvus
bb3f97b976 Merge branch 'master' into master 2020-11-23 13:06:40 +03:00
Felix Corvus
2093031333 4 new lines; 1 line changed; 7 removed lines
New:

- sectors.go
- keybind.research.name
- block.basalt-boulder.name
- hint.generator

Changed:

- setting.coreitems.name

Removed:

- zone.unlocked
- zone.requirement.complete
- zone.resources
- zone.objective
- zone.objective.survival
- zone.objective.attack
- setting.blockselecttimeout.name
2020-11-23 12:51:10 +03:00
Nikolass1000
bf60505584 Update bundle_pl.properties 2020-11-23 10:22:45 +01:00
Petr Gašparík
27eca77f96 Merge branch 'master' of https://github.com/Anuken/Mindustry into v116 2020-11-23 09:40:59 +01:00
NgLamVN
5d92b4dd2e I hate to do this in my phone 2020-11-23 13:44:07 +07:00
Thomas Widyantoko
fa04314db2 Merge pull request from Quick-korkc
Better turret desc
2020-11-23 10:18:11 +07:00
Anuken
8d91a9b014 Fixed sectors not auto-unlocking 2020-11-22 22:03:23 -05:00
Anuken
ecea8eab01 Various tweaks and bugfixes 2020-11-22 21:20:33 -05:00
Nikolass1000
dc00870c2a Update bundle_pl.properties 2020-11-23 01:30:57 +01:00
Anuken
3db2fea32b CI fix 2020-11-22 17:34:49 -05:00
Anuken
335e7489ce Fixed colors appearing in server logs 2020-11-22 17:33:10 -05:00
Anuken
ad71007a0a Campaign balance 2020-11-22 17:20:20 -05:00
Anuken
b595f7b175 Cleanup 2020-11-22 17:03:49 -05:00
Anuken
e783ad8893 Merge pull request #3526 from feu-follet/patch-5
Update bundle_fr_BE.properties
2020-11-22 17:00:36 -05:00
Anuken
0ac54aba83 Merge pull request #3516 from Quezler/patch-65
Remove stray newline
2020-11-22 17:00:28 -05:00
Anuken
fc47e1cf16 Merge pull request #3510 from Nikolass1000/patch-1
Polish language update.
2020-11-22 17:00:21 -05:00
Anuken
37246becc2 Merge pull request #3474 from PetrGasparik/v116
Czech translation for v116
2020-11-22 16:59:20 -05:00
Anuken
58e45aa22d Merge pull request #3462 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-11-22 16:59:09 -05:00
Anuken
5952785199 Merge pull request #3350 from YellOw139/patch-1
[Bundle][RO] Translation Update
2020-11-22 16:58:36 -05:00
Anuken
ea377c6f16 Bugfixes 2020-11-22 16:53:50 -05:00
YellOw139
0da32c969c Removed block select timeout 2020-11-22 23:07:27 +02:00
Anuken
b42e5c3b66 Merge remote-tracking branch 'origin/master' 2020-11-22 14:45:47 -05:00
Anuken
455e3188c4 More concentrated enemy bases 2020-11-22 14:45:43 -05:00
Nikolass1000
fa150eb5f1 Rest od desc. 2020-11-22 20:27:09 +01:00
Anuken
704b53a02e Merge pull request #3532 from Quezler/patch-66
unitBuildSpeedMultiplier | UnitSpawnAbility.java
2020-11-22 14:24:50 -05:00
Anuken
bf31a8c06b Merge remote-tracking branch 'origin/master' 2020-11-22 12:00:02 -05:00
Anuken
909dff7608 Bugfixes 2020-11-22 11:59:53 -05:00
Anuken
a8c22c1a99 Update bug_report.md 2020-11-22 11:38:38 -05:00
Patrick 'Quezler' Mounier
ebf7cf859e Update UnitSpawnAbility.java 2020-11-22 17:37:53 +01:00
Patrick 'Quezler' Mounier
3ef2c585a5 Update UnitSpawnAbility.java 2020-11-22 17:33:50 +01:00
feu-follet
84765f696b Update bundle_fr_BE.properties
Some fixes and new translations
2020-11-22 16:27:26 +01:00
YellOw139
925cc7318b Sector display polishes + Hints 2020-11-22 17:10:03 +02:00
NgLamVN
3271020e7c merge commit from main repository 2020-11-22 21:17:41 +07:00
EzLam
daf96241e1 re-trans 2020-11-22 21:12:11 +07:00
Anuken
9dba2389bb Merge pull request #3522 from YellOw136/master
Missing Vietnamese characters bugfix
2020-11-22 08:58:25 -05:00
EzLam
ef7d814049 Re-Trans 2020-11-22 20:14:08 +07:00
YellOw136
b707ef10f1 Add fixed font.woff 2020-11-22 12:59:42 +02:00
YellOw136
8f1d05b3e3 Delete font.woff 2020-11-22 12:59:12 +02:00
Felix Corvus
a84eb58d86 5 changed lines (@skykatik)
- sector.tarFields.description
- item.scrap.details
- block.resupply-point.description
- block.mass-driver.description
- block.mechanical-drill.description
2020-11-22 13:32:53 +03:00
Vanguard
b6b550fc04 1 changed line
map.multiplayer
2020-11-22 13:18:53 +03:00
Felix Corvus
df7d856aae 17 new lines; 7 changed lines; 21 removed lines
New:

- sectors.enemybase
- sectors.vulnerable
- sectors.underattack
- sectors.survives
- sector.curlost
- keybind.planet_map.name
- hint.schematicSelect
- hint.conveyorPathfind
- hint.conveyorPathfind.mobile
- hint.boost
- hint.command
- hint.command.mobile
- hint.payloadPickup
- hint.payloadPickup.mobile
- hint.payloadDrop
- hint.payloadDrop.mobile
- hint.waveFire

Changed:

- sector.overgrowth.description
- hint.mine
- hint.respawn.mobile
- hint.placeDrill.mobile
- hint.breaking.mobile
- hint.launch
- hint.launch.mobile

Removed:

- tutorial.next
- tutorial.intro
- tutorial.intro.mobile
- tutorial.drill
- tutorial.drill.mobile
- tutorial.blockinfo
- tutorial.conveyor
- tutorial.conveyor.mobile
- tutorial.turret
- tutorial.drillturret
- tutorial.pause
- tutorial.pause.mobile
- tutorial.unpause
- tutorial.unpause.mobile 
- tutorial.breaking
- tutorial.breaking.mobile
- tutorial.withdraw
- tutorial.deposit
- tutorial.waves
- tutorial.waves.mobile
- tutorial.launch
2020-11-22 13:15:07 +03:00
Anuken
19638da99d arc 2020-11-21 17:17:20 -05:00
Anuken
e4266d22f5 Added more hints 2020-11-21 17:17:03 -05:00
Nikolass1000
22bd64508c Small Omura fix 2020-11-21 22:15:44 +01:00
Anuken
b09dc47aad Bugfixes / Tutorial cleanup 2020-11-21 15:50:44 -05:00
Anuken
96b55c6b1c Merge pull request #3508 from DeltaNedas/extend
unified extend and extendContent to work for any class
2020-11-21 15:22:44 -05:00
Anuken
ac4a96eefb Merge pull request #3513 from Quezler/patch-64
Sync construction blocks
2020-11-21 15:22:25 -05:00
Felix Corvus
1b0d2dcdc0 23 new lines
- map.multiplayer
- hint.skip
- hint.desktopMove
- hint.zoom
- hint.mine
- hint.desktopShoot
- hint.depositItems
- hint.respawn
- hint.respawn.mobile
- hint.desktopPause
- hint.placeDrill
- hint.placeDrill.mobile
- hint.placeConveyor
- hint.placeConveyor.mobile
- hint.placeTurret
- hint.breaking
- hint.breaking.mobile
- hint.research
- hint.research.mobile
- hint.unitControl
- hint.unitControl.mobile
- hint.launch
- hint.launch.mobile
2020-11-21 22:32:16 +03:00
Nikolass1000
cd7c90f1f6 Polish unit descriptions 2020-11-21 20:30:18 +01:00
Anuken
3b991952b1 Merge remote-tracking branch 'origin/master' 2020-11-21 14:06:06 -05:00
Anuken
6fba84959c New hint tutorial system (unfinished!) 2020-11-21 14:05:58 -05:00
YellOw139
0662fd8427 Sector not found 2020-11-21 20:55:53 +02:00
Patrick 'Quezler' Mounier
55a929010e Remove stray newline 2020-11-21 18:51:50 +01:00
Patrick 'Quezler' Mounier
c6657109b1 Sync construction blocks 2020-11-21 16:59:09 +01:00
Nikolass1000
0422cf79b2 Polish language update. 2020-11-21 15:33:21 +01:00
Anuken
3ce6a6dea4 Merge pull request #3502 from skykatik/patch-8
[Typo] communitycommunity servers
2020-11-21 08:59:30 -05:00
DeltaNedas
09eed078cd unified extend and extendContent to work for any class 2020-11-21 13:04:17 +00:00
Skat
2b22170318 [Typo] communitycommunity servers 2020-11-21 10:31:10 +03:00
Quick-Korc
410c609785 Better turret desc 2020-11-21 13:23:07 +07:00
Thomas Widyantoko
f82b08e91d Merge pull request from Quick-korkc
New entity translate and minor change
2020-11-21 06:29:52 +07:00
Felix Corvus
589971a8c3 1 new line
sector.curlost
2020-11-21 02:09:15 +03:00
Anuken
522a7f4728 Fixed #3493 but for point defense turrets 2020-11-20 12:53:51 -05:00
Anuken
06921b53be Fixed #3493 2020-11-20 12:53:09 -05:00
Anuken
1372fc4079 Fixed sector gameover ghost bug 2020-11-20 12:38:16 -05:00
Angel_24
07b12890e8 Update bundle_es.properties 2020-11-20 18:14:55 +01:00
Angel_24
c014f86f2b Update bundle_es.properties
"Titanium" conveyor duplicated on "Plastanium"
2020-11-20 17:39:52 +01:00
Anuken
aa2783a885 Testing higher build numbers 2020-11-20 11:26:49 -05:00
Anuken
dbc0e6751b Merge remote-tracking branch 'origin/master' 2020-11-20 11:23:35 -05:00
Anuken
814065bf8e Removed Rules#tutorial 2020-11-20 11:23:30 -05:00
Anuken
3e5d5e4064 Merge pull request #3483 from skykatik/patch-7
Added missed log argument
2020-11-20 10:31:35 -05:00
Anuken
139fa329d4 Merge remote-tracking branch 'origin/master' 2020-11-20 09:13:40 -05:00
Anuken
abdccbb1bd Fixed #3487 / Fixed #3484 2020-11-20 09:13:36 -05:00
Anuken
0e4ec86f34 Merge pull request #3482 from Quezler/patch-59
Remove double whiteline from under package
2020-11-20 09:05:07 -05:00
Petr Gašparík
a634ca4858 Merge branch 'master' of https://github.com/Anuken/Mindustry into v116 2020-11-20 12:27:58 +01:00
Skat
67dcc28312 Update ServerControl.java 2020-11-20 12:58:46 +03:00
Patrick 'Quezler' Mounier
2d06495472 Remove double whiteline from under package 2020-11-20 10:55:01 +01:00
YellOw139
88535665e8 revert 2020-11-20 07:36:11 +02:00
YellOw139
75744256f9 Brief test 2020-11-20 07:31:50 +02:00
Anuken
a0f1f52a8b CI cleanup 2020-11-19 19:44:49 -05:00
Anuken
b1ace4a7c9 CI cleanup 2020-11-19 19:39:40 -05:00
Anuken
8214188215 CI cleanup 2020-11-19 19:32:27 -05:00
Anuken
07ddf806ac CI cleanup 2020-11-19 19:27:21 -05:00
Anuken
8bd2b9b45c CI cleanup 2020-11-19 19:26:10 -05:00
Anuken
4e9b07d8e2 CI cleanup 2020-11-19 18:54:28 -05:00
Anuken
a7aad1a1f9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.github/workflows/gradle.yml
2020-11-19 18:53:15 -05:00
Anuken
f71b726877 Testing Github Actions CI 2020-11-19 18:53:02 -05:00
Petr Gašparík
e700ef179e Czech translation up to commit 72d5a8a.
Hell of a work.
2020-11-20 00:33:13 +01:00
Anuken
ffcda6d246 Merge pull request #3470 from Quezler/patch-58
Allow for plugins to trigger the same alerts as sectors and guardians
2020-11-19 16:17:04 -05:00
Anuken
4d113a6aac Merge pull request #3472 from DeltaNedas/buildpr
upload pr jar
2020-11-19 15:13:58 -05:00
Patrick 'Quezler' Mounier
a6d1ac0b86 Use icon font in favor of def 2020-11-19 21:08:07 +01:00
Patrick 'Quezler' Mounier
637cca2e66 Probably one more 2020-11-19 20:50:14 +01:00
Patrick 'Quezler' Mounier
72136ebea3 Or is it? 2020-11-19 20:36:58 +01:00
Patrick 'Quezler' Mounier
ce045a470a Update NetClient.java 2020-11-19 20:34:49 +01:00
DeltaNedas
647911725b compile the jar first 2020-11-19 19:34:16 +00:00
DeltaNedas
61582fed3a upload pr jar 2020-11-19 19:15:23 +00:00
Patrick 'Quezler' Mounier
07893eee9c Allow for plugins to trigger the same alerts as sectors and guardians 2020-11-19 19:50:30 +01:00
Anuken
15ef32447c Merge remote-tracking branch 'origin/master' 2020-11-19 13:31:03 -05:00
Anuken
aef6ac4335 Made RepairAI only move toward ally buildings 2020-11-19 13:30:59 -05:00
Angel_24
ef2ff385b8 Añadido el "cada" de nuevo
Sabía que se me olvidaba algo, pero no tuve tiempo de revisarlo.
2020-11-19 19:21:40 +01:00
Anuken
d63efb1ff0 Merge pull request #3467 from Quezler/patch-57
Give some techtree brackets a new line
2020-11-19 12:45:05 -05:00
Anuken
f4c69372c9 Merge pull request #3468 from skykatik/patch-6
Remove space in ban message & added @ for argument
2020-11-19 12:44:52 -05:00
Skat
16adbd667d Update ServerControl.java 2020-11-19 20:40:00 +03:00
Patrick 'Quezler' Mounier
dd9b85f79b Give some techtree brackets a new line 2020-11-19 18:32:03 +01:00
Anuken
c468bdef6d Merge remote-tracking branch 'origin/master' 2020-11-19 12:31:31 -05:00
Anuken
97c3d36bae Re-added preloading of ground enemy path / Core unit casing FX 2020-11-19 12:31:27 -05:00
Anuken
9033683e15 Merge pull request #3466 from Quezler/patch-55
Remove leading space from console kick message
2020-11-19 12:22:49 -05:00
Patrick 'Quezler' Mounier
1c48bc786b Remove leading space from console kick message 2020-11-19 18:21:17 +01:00
Anuken
7612a22480 Implemented legacy (V5) research loading 2020-11-19 11:55:46 -05:00
Felix Corvus
f07a108410 1 line changed
block.interplanetary-accelerator.description
2020-11-19 19:08:25 +03:00
Angel_24
31d401340c Update bundle_es.properties 2020-11-19 14:57:16 +01:00
Angel_24
c3df430a4e Update bundle_es.properties 2020-11-19 14:56:12 +01:00
YellOw139
babb6616ef Interplanetary strings 2020-11-19 10:02:32 +02:00
Quick-Korc
7515d1aca7 New entity translate and minor change 2020-11-19 13:32:21 +07:00
Thomas Widyantoko
224cd7bb44 changed boss.health and new lines addition
"Darah Bos" to "Darah Guardian"
indev.campaign and interplanetary-accelerator
planetaryTerminal sector
2020-11-19 08:50:31 +07:00
Angel_24
071d98dbfa Update bundle_es.properties 2020-11-18 20:48:12 +01:00
YellOw139
9fe01eec38 Translation Allowed + few commit bumps 2020-11-18 10:55:41 +02:00
Thomas Widyantoko
8a3c4b4ddd [Bundle][ID] Updated translation
Sector names are reverted back to previous translation name along with the updated new sectors, Foreshadow block description, sector captured/attacked/lost popup, threats, stats, and other fixes.
2020-11-18 14:13:28 +07:00
YellOw139
73955611d1 sector stuff 2020-11-17 11:22:04 +02:00
YellOw139
f56c944329 translation forbidden 2020-11-16 07:55:48 +02:00
YellOw139
7affde5a2e oh no no ui 2020-11-15 23:49:30 +02:00
YellOw139
4a46baecae Updated indev and scrap 2020-11-15 22:46:13 +02:00
YellOw139
e9f7ba5f41 Enemy Cores in Sectors 2020-11-15 18:16:58 +02:00
YellOw139
775b3592a3 reqs typos/improvements 2020-11-14 22:14:13 +02:00
YellOw139
59a7b584fb req.produce 2020-11-14 22:10:24 +02:00
YellOw139
3055485e17 Good stuff I can't even translate 2020-11-14 10:22:59 +02:00
YellOw139
bd992b4612 Unit stats look threatening 2020-11-14 00:01:17 +02:00
YellOw139
56fece1a30 [Bundle][RO] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit ddc2cc7098
- Typo fixes & various other improvements
2020-11-11 21:51:00 +02:00
ThePythonGuy
95caa247f5 Merge pull request #6 from QmelZ/patch-2
Update bundle_tr.properties
2020-08-16 09:05:13 +02:00
ThePythonGuy
aeeabcb38f Update bundle_pl.properties 2020-08-10 12:35:43 +02:00
QmelZ
2d7a5e637d Update bundle_tr.properties 2020-08-10 00:02:03 +03:00
ThePythonGuy
a28366ee80 Update bundle_uk_UA.properties 2020-08-09 15:55:31 +02:00
ThePythonGuy
e96a9a2f32 facepalm 2020-08-09 15:49:04 +02:00
ThePythonGuy
b8fca9a091 nope, now _everything_ is fixed 2020-08-09 11:57:48 +02:00
ThePythonGuy
816402ae56 hopefully everything got fixed 2020-08-09 11:56:03 +02:00
ThePythonGuy
b8ed189bcb Merge pull request #5 from Gdeft/patch-2
Update bundle.in_ID.properties: Mod Browser
2020-08-09 11:11:03 +02:00
Gdeft
e4b0ea92da Update bundle.in_ID.properties: Mod Browser 2020-08-09 16:09:33 +07:00
ThePythonGuy
ca931987c4 Merge pull request #4 from J-VdS/patch-2
better look
2020-08-08 22:15:49 +02:00
J-VdS
f9a0d7a3c6 better look
this looks better in my opinion
2020-08-08 21:33:32 +02:00
ThePythonGuy
840f6e43c3 Merge pull request #2 from Catchears/patch-1
Add german translation
2020-08-08 19:34:13 +02:00
ThePythonGuy
89872902e7 Merge pull request #3 from Remint32/patch-3
RU l10n for Mod Browser PR
2020-08-08 19:33:42 +02:00
ThePythonGuy
d6065865f5 Delete warning 2020-08-08 19:31:52 +02:00
Felix Corvus
b56aa4adc2 Update bundle_ru.properties 2020-08-08 07:58:51 +03:00
Felix Corvus
b36c074e72 RU l10n for Mod Browser PR 2020-08-08 07:56:21 +03:00
Wiki Updater
4df0393e00 Add german translation 2020-08-07 17:19:24 +02:00
ThePythonGuy
7bfbca7234 Update ModsDialog.java 2020-08-04 11:17:13 +02:00
ThePythonGuy
dfcd94c4bc inconsistency fix 2020-08-02 11:29:55 +02:00
ThePythonGuy
ee3c99991e Update bundle_fr.properties 2020-08-01 18:02:16 +02:00
ThePythonGuy
11a8c227d2 Update bundle_es.properties 2020-08-01 18:01:31 +02:00
ThePythonGuy
f37ecda3a7 Update bundle.properties 2020-08-01 18:01:12 +02:00
ThePythonGuy
a3054c75b4 Update bundle_uk_UA.properties 2020-08-01 17:53:12 +02:00
ThePythonGuy
428e1f22d5 Update ModsDialog.java 2020-08-01 17:31:54 +02:00
ThePythonGuy
faf1ea3102 Update bundle_ko.properties 2020-08-01 17:31:30 +02:00
ThePythonGuy
c287a173e3 Update bundle_fr.properties 2020-08-01 17:30:13 +02:00
ThePythonGuy
2aa70fdae5 Update bundle_es.properties 2020-08-01 17:27:54 +02:00
ThePythonGuy
5aeb77fd65 Update bundle.properties 2020-08-01 17:25:22 +02:00
ThePythonGuy
53f0a4516f Update ModsDialog.java 2020-08-01 15:49:53 +02:00
ThePythonGuy
451a4faa5b fix 2020-07-31 16:06:42 +02:00
ThePythonGuy
2e09373fdc less margin 2020-07-31 14:29:23 +02:00
ThePythonGuy
df635777c3 larger margin 2020-07-31 13:20:38 +02:00
ThePythonGuy
b2f973735b add margin to the buttons 2020-07-31 12:49:03 +02:00
ThePythonGuy
3a2a591c43 Last fix (i hope) 2020-07-31 12:35:32 +02:00
ThePythonGuy
5d4cbf6af5 Update ModsDialog.java 2020-07-31 12:34:36 +02:00
ThePythonGuy
d83405c946 fix 2020-07-31 12:33:25 +02:00
ThePythonGuy
1d24dd6d4d Create Mod Browser 2020-07-31 12:12:43 +02:00
580 changed files with 19128 additions and 59101 deletions

View File

@@ -17,11 +17,14 @@ assignees: ''
**Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.* **Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.*
**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.* **Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.*
**Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.* If you remove the line above without reading it properly and understanding what it means, I will reap your soul. Even if you're playing on someone's server, you can still save the game to a slot.
**(Crash) logs**: *Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs. REQUIRED if you are reporting a crash.*
--- ---
*Place an X (no spaces) between the brackets to confirm that you have read the line below.* *Place an X (no spaces) between the brackets to confirm that you have read the line below.*
- [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**
- [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.** - [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.**

67
.github/workflows/deployment.yml vendored Normal file
View File

@@ -0,0 +1,67 @@
name: Deployment
on:
push:
tags:
- 'v*'
jobs:
buildJava14:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 14
uses: actions/setup-java@v1
with:
java-version: 14
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Add Arc release
run: |
git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
cd ../Arc
git tag ${RELEASE_VERSION}
git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${RELEASE_VERSION};
cd ../Mindustry
- name: Create artifacts
run: |
./gradlew desktop:dist server:dist core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1}
- name: Update docs
run: |
cd ../
git config --global user.email "cli@github.com"
git config --global user.name "Github Actions"
git clone --depth=1 https://github.com/MindustryGame/docs.git
cd docs
find . -maxdepth 1 ! -name ".git" ! -name . -exec rm -r {} \;
cd ../
cp -a Mindustry/core/build/javadoc/. docs/
cd docs
git add .
git commit -m "Update ${RELEASE_VERSION:1}"
git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
cd ../Mindustry
- name: Update F-Droid build string
run: |
git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
cd ../MindustryBuilds
echo "Updating version to ${RELEASE_VERSION:1}"
echo versionName=6-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${RELEASE_VERSION:1} > version_fdroid.txt
git add .
git commit -m "Updating to build ${RELEASE_VERSION:1}"
git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds
cd ../Mindustry
- name: Upload client artifacts
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: desktop/build/libs/Mindustry.jar
tag: ${{ github.ref }}
- name: Upload server artifacts
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: server/build/libs/server-release.jar
tag: ${{ github.ref }}

View File

@@ -1,27 +0,0 @@
name: Java CI
on: [push, pull_request]
jobs:
buildJava14:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 14
uses: actions/setup-java@v1
with:
java-version: 14
- name: Run unit tests with gradle and Java 14
run: ./gradlew compileJava
buildJava15:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 15
uses: actions/setup-java@v1
with:
java-version: 15
- name: Run unit tests with gradle and Java 15
run: ./gradlew compileJava

21
.github/workflows/pr.yml vendored Normal file
View File

@@ -0,0 +1,21 @@
name: Pull Request Tests
on: [pull_request]
jobs:
buildJava14:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 14
uses: actions/setup-java@v1
with:
java-version: 14
- name: Run unit tests and build JAR
run: ./gradlew test desktop:dist
- name: Upload desktop JAR for testing
uses: actions/upload-artifact@v2
with:
name: Desktop JAR (zipped)
path: desktop/build/libs/Mindustry.jar

25
.github/workflows/push.yml vendored Normal file
View File

@@ -0,0 +1,25 @@
name: Tests
on: [push, workflow_dispatch]
jobs:
buildJava14:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 14
uses: actions/setup-java@v1
with:
java-version: 14
- name: Run unit tests
run: ./gradlew clean cleanTest test
- name: Trigger BE build
if: ${{ github.repository == 'Anuken/Mindustry' }}
run: |
git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
cd ../MindustryBuilds
BNUM=$(($GITHUB_RUN_NUMBER + 20000))
git tag ${BNUM}
git config --global user.name "Build Uploader"
git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM}

7
.gitignore vendored
View File

@@ -43,10 +43,17 @@ ios/robovm.properties
packr-out/ packr-out/
config/ config/
*.gif *.gif
/tests/out
/core/assets/basepartnames /core/assets/basepartnames
version.properties version.properties
#sprites
core/assets/sprites/sprites*
core/assets/sprites/fallback/
core/assets/sprites/block_colors.png
.attach_* .attach_*
## Java ## Java

View File

@@ -1,50 +0,0 @@
jdk:
- openjdk14
dist: xenial
android:
components:
- android-29
- build-tools-29.0.3
script:
- git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
- cd ../MindustryBuilds
- echo ${TRAVIS_TAG}
- if [ -n "$TRAVIS_TAG" ]; then echo versionName=6-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi
- git tag ${TRAVIS_BUILD_NUMBER}
- git config --global user.name "Build Uploader"
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; fi
- cd ../Mindustry
- git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
- if [ -n "$TRAVIS_TAG" ]; then cd ../Arc; git tag ${TRAVIS_TAG}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/Arc ${TRAVIS_TAG}; cd ../Mindustry; fi
- "./gradlew test"
- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
- "./gradlew core:javadoc"
- cd ../
- git clone --depth=1 https://github.com/MindustryGame/docs.git
- cp -a Mindustry/core/build/docs/javadoc/. docs/
- cd docs
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git add .; git commit -m "Update ${TRAVIS_BUILD_NUMBER}"; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/docs; fi
- cd ../Mindustry
deploy:
- provider: releases
cleanup: false
draft: false
api_key:
secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
file:
- desktop/build/libs/Mindustry.jar
- server/build/libs/server-release.jar
on:
repo: Anuken/Mindustry
tags: true
#- provider: script
# script: bash update_wiki.sh
# on:
# repo: Anuken/Mindustry
# tags: true
env:
global:
- secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
- secure: VEskj/0TVX2o7iUVXuVPysj/VSWmPhDl57SrT7/nBNN/P/8N5jFAvx8PMzG7qT0S5FzKxuV20psE4WylUGRKdeRtK7/QNBV7T3YqYYM6BUB1VeRpxe5hLxTeuBK3izglFO8DkdDqjUtzQSjzkoYT75ilROjhBrBUPhVek7UlbBHbaklPWYFXHnJmYS1FpZTdzqIj+Y0Gd1PSL2MzK4X74aAHl0qaDgsTwYwtKs7IAz+kFaTZBRpi9VjQHAFhDlkDR3jo9wQjH8/F6x0lCgV/FulSc37Okdb40sLFG98xcEA6gWh1NPMkz8CulUdVE7mj7SJNxLbNvoMNrWOVRjmEsn59p/9LiNC1F9ncFz9vjQjAmi7rMFFGHGxe5nn8cIAkpTvHQQkZoWHAA9SNJTDMMf09m2pRy/vvzx+a6NVxyC9iNrhLlnBg4gxAqRh0S6NU0uL+fuygKixn7rqlnb7KMT7bAbfcuV+dng6c8V7hYKDCh7sJbH8iJump1xkwoM7ecnU8fxJF/oKOr/fbk0Bfxu+Q9qYLrV1+DEdm93Vl2Thq+DBKmI66jRGSva6HeCLFo81PEiEjP1nLv75+kvVfOqVqJrZD1BrvoG2eWT/3hVLrN2kEIWWlpvQVC7FL11yWmYtAuOBh/vfhI76zKr+YTS6ccG9rqW4XeYjJytshe8M=

View File

@@ -15,9 +15,6 @@ If you are submitting a new block, make sure it has a name and description, and
If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*). If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*).
For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it. For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it.
### Do not include packed sprites in your pull request.
When making a pull request that changes or adds new sprites, do not add the modified atlas & `spritesX.png` files to your final pull request. These are a frequent source of conflicts.
## Style Guidelines ## Style Guidelines

52
ISSUES.md Normal file
View File

@@ -0,0 +1,52 @@
# Why was my issue closed?
This document goes over some common causes for issue closures.
## You did not fill in the template
I can't debug the problem unless you provide the information the template asks for.
If you cannot put in the effort to fill out a template, then don't expect me to put in the effort to fix it.
## Your issue was already reported
If the problem in your issue has already been encountered before, it will be closed - especially if your report doesn't provide any new information.
Make sure you search the *closed* issues before making an issue.
I do not link the specific issue(s) that report the same problem, because searching takes time - if you're interested in finding them, you should be able to do so without my help.
To be clear: I do **not** expect users to look at *all* previous issues, or do a comprehensive stack trace analysis to see if their crash was already reported.
## Your issue was already fixed
The problem you reported has been addressed. Note that this does **not** mean that the latest stable version of Mindustry has the fix!
It simply means that I have committed (or am about to commit) a patch that fixes it *on the current development branch*.
## Your issue is missing a crash report or log
If the game crashes without a specific cause, and you don't send me a log, I can't fix it. There is no way for me to know what went wrong.
During a normal crash, the game should tell you where the log is saved. If not, you should still be able to look in the game's crash folder on most operating systems, or export the logs in *Settings -> Game Data -> Export Crash Logs*.
## Your issue is missing saves or screenshots
Even if you think your problem happens everywhere and saves/screenshots are redundant, this is frequently not the case.
If I cannot reproduce the problem on my own saves and you have not linked any of your own, then the problem is likely to be save-specific. If you do not send me any, the problem cannot be investigated further.
## Your issue is related to an external program
If Mindustry causes something else to crash or misbehave, I am very unlikely to fix it. Unless the problem is serious, widespread and/or clearly a bug *in Mindustry*, it is not my responsibility.
Similarly, if you use another (invasive) program to change how Mindustry works, and something goes wrong, that is not my problem. Don't do it.
## Your issue is caused by mods
Crashes and bugs related to installed mods should be reported in the relevant mod repository, not here.
*Note that problems with the Mindustry modding API are a separate problem, and do not apply.*
## I cannot reproduce your issue
If I follow your instructions and am repeatedly unable to reproduce the problem you've reported, then it is very unlikely to be fixed.
Either the problem is device-specific, or there is not enough information given for me to be able to reproduce it.
I may attempt to change some code if I think it will make the issue less likely to occur, but without knowing for sure, the issue cannot be considered truly "fixed".
As I cannot make any further progress on the problem, there is no reason to keep it open. If it is a common bug/crash, other people will come along with information that may shed some light on the issue.

View File

@@ -1,7 +1,7 @@
![Logo](core/assets-raw/sprites/ui/logo.png) ![Logo](core/assets-raw/sprites/ui/logo.png)
[![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry) [![Build Status](https://github.com/Anuken/Mindustry/workflows/Tests/badge.svg?event=push)](https://github.com/Anuken/Mindustry/actions)
[![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord)](https://discord.gg/mindustry) [![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord&color=17cf48)](https://discord.gg/mindustry)
A sandbox tower defense game written in Java. A sandbox tower defense game written in Java.
@@ -61,5 +61,5 @@ Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Su
## Downloads ## Downloads
| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) | | [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry)
|--- |--- |--- |--- | |--- |--- |--- |--- |

View File

@@ -1,22 +1,23 @@
### Adding a server to the list ### Adding a server to the list
Mindustry now has a public list of servers that everyone can see and connect to. Mindustry now has a public list of servers that everyone can see and connect to.
This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers.json) in this repository. This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json) in this repository.
You may want to add your server to this list. The steps for getting this done are as follows: You may want to add your server to this list. The steps for getting this done are as follows:
1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well. 1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well.
You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins. You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins.
*Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example. *Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example.
2. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that: 2. Make sure that your server is able to handle inappropriate content - this includes NSFW display/sorter art and abusive messages. **Servers that allow such content will be removed immediately.** Consider banning display blocks if it is a problem for your server: `rules add bannedBlocks ["logic-display", "large-logic-display"]`.
3. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
- Your name or description must reflect the type of server you're hosting. - Your name or description must reflect the type of server you're hosting.
Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt. Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
- Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you. - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
- Try to be professional in your text; use common sense. - Try to be professional in your text; use common sense.
3. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option. 4. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
4. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`). 5. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
5. Finally, **submit a pull request** to add your server's IP to the list. 6. Finally, **submit a pull request** to add your server's IP to the list.
This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers.json), then add a JSON object with a single key, indicating your server address. This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json), then add a JSON object with a single key, indicating your server address.
For example, if your server address is `google.com`, you would add a comma after the last entry and insert: For example, if your server address is `google.com`, you would add a comma after the last entry and insert:
```json ```json
{ {

View File

@@ -4,7 +4,6 @@ buildscript{
mavenCentral() mavenCentral()
google() google()
maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" } maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter()
} }
dependencies{ dependencies{
@@ -20,8 +19,8 @@ configurations{ natives }
repositories{ repositories{
mavenCentral() mavenCentral()
jcenter()
maven{ url "https://maven.google.com" } maven{ url "https://maven.google.com" }
jcenter() //remove later once google fixes the dependency
} }
dependencies{ dependencies{
@@ -35,7 +34,8 @@ dependencies{
natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}" natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}"
//android dependencies magically disappear during compilation, thanks gradle! //android dependencies magically disappear during compilation, thanks gradle!
if(new File(projectDir.parent, '../Arc').exists()) compileOnly fileTree(dir: '../../Arc/backends/backend-android/libs', include: ['*.jar']) def sdkFile = new File((String)findSdkDir(), "/platforms/android-29/android.jar")
if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
} }
task deploy(type: Copy){ task deploy(type: Copy){
@@ -151,3 +151,9 @@ task run(type: Exec){
def adb = path + "/platform-tools/adb" def adb = path + "/platform-tools/adb"
commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher' commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
} }
if(!project.ext.hasSprites()){
println "Scheduling sprite pack."
run.dependsOn ":tools:pack"
deploy.dependsOn ":tools:pack"
}

View File

@@ -45,6 +45,7 @@ public class AndroidLauncher extends AndroidApplication{
handler.uncaughtException(thread, error); handler.uncaughtException(thread, error);
}else{ }else{
error.printStackTrace(); error.printStackTrace();
Log.err(error);
System.exit(1); System.exit(1);
} }
}); });
@@ -71,9 +72,8 @@ public class AndroidLauncher extends AndroidApplication{
} }
@Override @Override
public Class<?> loadJar(Fi jar, String mainClass) throws Exception{ public ClassLoader loadJar(Fi jar, String mainClass) throws Exception{
DexClassLoader loader = new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, getClassLoader()); return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, getClassLoader());
return Class.forName(mainClass, true, loader);
} }
@Override @Override
@@ -161,7 +161,6 @@ public class AndroidLauncher extends AndroidApplication{
}, new AndroidApplicationConfiguration(){{ }, new AndroidApplicationConfiguration(){{
useImmersiveMode = true; useImmersiveMode = true;
hideStatusBar = true; hideStatusBar = true;
stencil = 8;
}}); }});
checkFiles(getIntent()); checkFiles(getIntent());

View File

@@ -46,7 +46,7 @@ public class AssetsProcess extends BaseProcessor{
String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", ""); String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", "");
if(SourceVersion.isKeyword(name) || name.equals("char")) name += "i"; if(SourceVersion.isKeyword(name) || name.equals("char")) name += "i";
ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("(char)" + key).build()); ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).addJavadoc(String.format("\\u%04x", Integer.parseInt(key))).initializer("'" + ((char)Integer.parseInt(key)) + "'").build());
}); });
ictype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectMap.class, String.class, TextureRegionDrawable.class), ictype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectMap.class, String.class, TextureRegionDrawable.class),
@@ -64,7 +64,7 @@ public class AssetsProcess extends BaseProcessor{
int code = val.getInt("code", 0); int code = val.getInt("code", 0);
iconcAll.append((char)code); iconcAll.append((char)code);
ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("(char)" + code).build()); ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).addJavadoc(String.format("\\u%04x", code)).initializer("'" + ((char)code) + "'").build());
ichinit.addStatement("codes.put($S, $L)", name, code); ichinit.addStatement("codes.put($S, $L)", name, code);
ictype.addField(TextureRegionDrawable.class, name + "Small", Modifier.PUBLIC, Modifier.STATIC); ictype.addField(TextureRegionDrawable.class, name + "Small", Modifier.PUBLIC, Modifier.STATIC);

View File

@@ -63,7 +63,7 @@ public class RemoteProcess extends BaseProcessor{
classes = new Seq<>(); classes = new Seq<>();
Seq<Smethod> orderedElements = elements.copy(); Seq<Smethod> orderedElements = elements.copy();
orderedElements.sortComparing(Object::toString); orderedElements.sort((a, b) -> -a.toString().compareTo(b.toString()));
//create methods //create methods
for(Smethod element : orderedElements){ for(Smethod element : orderedElements){
@@ -71,12 +71,12 @@ public class RemoteProcess extends BaseProcessor{
//check for static //check for static
if(!element.is(Modifier.STATIC) || !element.is(Modifier.PUBLIC)){ if(!element.is(Modifier.STATIC) || !element.is(Modifier.PUBLIC)){
err("All @Remote methods must be public and static: ", element); err("All @Remote methods must be public and static", element);
} }
//can't generate none methods //can't generate none methods
if(annotation.targets() == Loc.none){ if(annotation.targets() == Loc.none){
err("A @Remote method's targets() cannot be equal to 'none':", element); err("A @Remote method's targets() cannot be equal to 'none'", element);
} }
//get and create class entry if needed //get and create class entry if needed

View File

@@ -107,7 +107,7 @@ public class RemoteReadGenerator{
} }
readBlock.nextControlFlow("catch (java.lang.Exception e)"); readBlock.nextControlFlow("catch (java.lang.Exception e)");
readBlock.addStatement("throw new java.lang.RuntimeException(\"Failed to to read remote method '" + entry.element.getSimpleName() + "'!\", e)"); readBlock.addStatement("throw new java.lang.RuntimeException(\"Failed to read remote method '" + entry.element.getSimpleName() + "'!\", e)");
readBlock.endControlFlow(); readBlock.endControlFlow();
} }

View File

@@ -0,0 +1 @@
{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -0,0 +1 @@
{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

View File

@@ -12,7 +12,6 @@ buildscript{
mavenCentral() mavenCentral()
google() google()
maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" } maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter()
maven{ url 'https://jitpack.io' } maven{ url 'https://jitpack.io' }
} }
@@ -32,11 +31,11 @@ allprojects{
ext{ ext{
versionNumber = '6' versionNumber = '6'
if(!project.hasProperty("versionModifier")) versionModifier = 'beta' if(!project.hasProperty("versionModifier")) versionModifier = 'release'
if(!project.hasProperty("versionType")) versionType = 'official' if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry' appName = 'Mindustry'
steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256' steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
rhinoVersion = '2617981f706e50b8753155d8e15e326308be3b22' rhinoVersion = '378626d8abc552bba57864358358045d2f2dbe9b'
loadVersionProps = { loadVersionProps = {
return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p } return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -83,6 +82,10 @@ allprojects{
return "v$buildVersion" return "v$buildVersion"
} }
hasSprites = {
return new File(rootDir, "core/assets/sprites/sprites.atlas").exists()
}
getModifierString = { getModifierString = {
if(versionModifier != "release"){ if(versionModifier != "release"){
return "[${versionModifier.toUpperCase()}]" return "[${versionModifier.toUpperCase()}]"
@@ -99,6 +102,17 @@ allprojects{
return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1) return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1)
} }
findSdkDir = {
//null because IntelliJ doesn't get env variables
def v = System.getenv("ANDROID_HOME")
if(v != null) return v
//rootDir is null here, amazing. brilliant.
def file = new File("local.properties")
if(!file.exists()) file = new File("../local.properties")
def props = new Properties().with{p -> p.load(file.newReader()); return p }
return props.get("sdk.dir")
}
generateLocales = { generateLocales = {
def output = 'en\n' def output = 'en\n'
def bundles = new File(project(':core').projectDir, 'assets/bundles/') def bundles = new File(project(':core').projectDir, 'assets/bundles/')
@@ -169,7 +183,6 @@ allprojects{
maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" } maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
maven{ url "https://oss.sonatype.org/content/repositories/releases/" } maven{ url "https://oss.sonatype.org/content/repositories/releases/" }
maven{ url 'https://jitpack.io' } maven{ url 'https://jitpack.io' }
jcenter()
} }
task clearCache{ task clearCache{
@@ -242,18 +255,22 @@ project(":ios"){
task incrementConfig{ task incrementConfig{
def vfile = file('robovm.properties') def vfile = file('robovm.properties')
def bversion = getBuildVersion()
def props = new Properties() def props = new Properties()
if(vfile.exists()){ if(vfile.exists()){
props.load(new FileInputStream(vfile)) props.load(new FileInputStream(vfile))
}else{ }else{
props['app.id'] = 'io.anuke.mindustry' props['app.id'] = 'io.anuke.mindustry'
props['app.version'] = '5.0' props['app.version'] = '6.0'
props['app.mainclass'] = 'mindustry.IOSLauncher' props['app.mainclass'] = 'mindustry.IOSLauncher'
props['app.executable'] = 'IOSLauncher' props['app.executable'] = 'IOSLauncher'
props['app.name'] = 'Mindustry' props['app.name'] = 'Mindustry'
} }
props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + "" props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
if(bversion != "custom build"){
props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0")
}
props.store(vfile.newWriter(), null) props.store(vfile.newWriter(), null)
} }
@@ -286,9 +303,10 @@ project(":core"){
def props = loadVersionProps() def props = loadVersionProps()
def androidVersion = props['androidBuildCode'].toInteger() - 2 def androidVersion = props['androidBuildCode'].toInteger() - 2
def loglines = file("../changelog").text.split("\n") def loglines = file("../changelog").text.split("\n")
def notice = "[This is a truncated changelog, see Github for full notes]"
def maxLength = 460 def maxLength = 460
def androidLogList = loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")} def androidLogList = [notice] + loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
def result = "" def result = ""
androidLogList.forEach{line -> androidLogList.forEach{line ->
if(result.length() + line.length() + 1 < maxLength){ if(result.length() + line.length() + 1 < maxLength){
@@ -300,6 +318,15 @@ project(":core"){
} }
} }
task sourcesJar(type: Jar, dependsOn: classes){
classifier = 'sources'
from sourceSets.main.allSource
}
artifacts{
archives sourcesJar
}
dependencies{ dependencies{
compileJava.dependsOn(preGen) compileJava.dependsOn(preGen)
@@ -317,6 +344,28 @@ project(":core"){
annotationProcessor 'com.github.Anuken:jabel:34e4c172e65b3928cd9eabe1993654ea79c409cd' annotationProcessor 'com.github.Anuken:jabel:34e4c172e65b3928cd9eabe1993654ea79c409cd'
} }
afterEvaluate{
task mergedJavadoc(type: Javadoc){
def blacklist = [project(":ios"), project(":desktop"), project(":server"), project(":annotations")]
if(findProject(":android") != null){
blacklist += project(":android")
}
source rootProject.subprojects.collect{ project ->
if(!blacklist.contains(project) && project.hasProperty("sourceSets")){
return project.sourceSets.main.allJava
}
}
classpath = files(rootProject.subprojects.collect { project ->
if(!blacklist.contains(project) && project.hasProperty("sourceSets")){
return project.sourceSets.main.compileClasspath
}
})
destinationDir = new File(buildDir, 'javadoc')
}
}
} }
project(":server"){ project(":server"){
@@ -367,7 +416,6 @@ project(":annotations"){
dependencies{ dependencies{
implementation 'com.squareup:javapoet:1.12.1' implementation 'com.squareup:javapoet:1.12.1'
implementation "com.github.Anuken.Arc:arc-core:$arcHash" implementation "com.github.Anuken.Arc:arc-core:$arcHash"
implementation files("${System.getProperty('java.home')}/../lib/tools.jar")
} }
} }
@@ -391,3 +439,12 @@ task deployAll{
dependsOn "server:deploy" dependsOn "server:deploy"
dependsOn "android:deploy" dependsOn "android:deploy"
} }
task resolveDependencies{
doLast{
rootProject.allprojects{ project ->
Set<Configuration> configurations = project.buildscript.configurations + project.configurations
configurations.findAll{c -> c.canBeResolved}.forEach{c -> c.resolve()}
}
}
}

View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
version="1.1"
id="svg542"
sodipodi:docname="planet.svg"
inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
<metadata
id="metadata548">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs546" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2560"
inkscape:window-height="1316"
id="namedview544"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="15.75"
inkscape:cx="-16.385458"
inkscape:cy="16.16535"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg542" />
<path
id="polygon2"
style="fill:#ffffff"
d="M 5.5 0 L 5 0.5 L 4.5 1 L 3.5 1 L 3 1.5 L 2.5 2 L 2 2.5 L 1.5 3 L 1 3.5 L 1 4.5 L 0.5 5 L 0 5.5 L 0 6.5 L 0 7.5 L 0 8.5 L 0 9.5 L 0 10.5 L 0.5 11 L 1 11.5 L 1 12.5 L 1.5 13 L 2 13.5 L 2.5 14 L 3 14.5 L 3.5 15 L 4.5 15 L 5 15.5 L 5.5 16 L 6.5 16 L 7.5 16 L 8.5 16 L 9.5 16 L 10.5 16 L 11 15.5 L 11.5 15 L 12.5 15 L 13 14.5 L 13.5 14 L 14 13.5 L 14.5 13 L 15 12.5 L 15 11.5 L 15.5 11 L 16 10.5 L 16 9.5 L 16 8.5 L 16 7.5 L 16 6.5 L 16 5.5 L 15.5 5 L 15 4.5 L 15 3.5 L 14.5 3 L 14 2.5 L 13.5 2 L 13 1.5 L 12.5 1 L 11.5 1 L 11 0.5 L 10.5 0 L 9.5 0 L 8.5 0 L 7.5 0 L 6.5 0 L 5.5 0 z M 6.5 1 L 7 1.5 L 7.5 2 L 8.5 2 L 9 2.5 L 9 3.5 L 9.5 4 L 10 4.5 L 10.5 5 L 11 5.5 L 11.5 6 L 12.5 6 L 13.5 6 L 14.5 6 L 15 6.5 L 15 7.5 L 15 8.5 L 15 9.5 L 14.5 10 L 14 10.5 L 14 11.5 L 13.5 12 L 13 12.5 L 12.5 13 L 12 13.5 L 11.5 14 L 10.5 14 L 10 14.5 L 9.5 15 L 8.5 15 L 8 14.5 L 7.5 14 L 7 13.5 L 7 12.5 L 7.5 12 L 8 11.5 L 8.5 11 L 9 10.5 L 9 9.5 L 9 8.5 L 8.5 8 L 8 7.5 L 7.5 7 L 6.5 7 L 5.5 7 L 4.5 7 L 4 7.5 L 3.5 8 L 3 8.5 L 2.5 9 L 2 9.5 L 1.5 10 L 1 9.5 L 1 8.5 L 1 7.5 L 1 6.5 L 1.5 6 L 2 5.5 L 2 4.5 L 2.5 4 L 3 3.5 L 3.5 3 L 4 2.5 L 4.5 2 L 5.5 2 L 6 1.5 L 6.5 1 z M 11.5 9 L 11 9.5 L 11 10.5 L 11.5 11 L 12.5 11 L 13 10.5 L 13 9.5 L 12.5 9 L 11.5 9 z " />
</svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 536 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 430 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 B

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 560 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 682 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 675 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 819 B

After

Width:  |  Height:  |  Size: 755 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 868 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 845 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 623 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 467 B

After

Width:  |  Height:  |  Size: 660 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 470 B

After

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 311 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 763 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 B

After

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 611 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,2 +1,3 @@
mschxœ-k mschxњ-Ќ‹
1 „ÇMÅîуôPÅ В0 EoЧКєўТЏЄ®И ¶Ґ«Ёџ.CfІJ‡<NЗ*Ш»Г<C2BB>lцЮѕиmЖ0№ељзTжЂN)>]6!NОРьж0,)Ь‡&ЩІЌцbKqщЌу~И$њя+А­Vh¶•т №} ¶U
кwZР;¤$ґ ]Сґ…]P,(І»ЉЎkҐ№ъЕ¶,e

View File

@@ -13,6 +13,7 @@ link.google-play.description = Google Play store listing
link.f-droid.description = F-Droid listing link.f-droid.description = F-Droid listing
link.wiki.description = Official Mindustry wiki link.wiki.description = Official Mindustry wiki
link.suggestions.description = Suggest new features link.suggestions.description = Suggest new features
link.bug.description = Found one? Report it here
linkfail = Failed to open link!\nThe URL has been copied to your clipboard. linkfail = Failed to open link!\nThe URL has been copied to your clipboard.
screenshot = Screenshot saved to {0} screenshot = Screenshot saved to {0}
screenshot.invalid = Map too large, potentially not enough memory for screenshot. screenshot.invalid = Map too large, potentially not enough memory for screenshot.
@@ -22,9 +23,8 @@ gameover.pvp = The[accent] {0}[] team is victorious!
gameover.waiting = [accent]Waiting for next map... gameover.waiting = [accent]Waiting for next map...
highscore = [accent]New highscore! highscore = [accent]New highscore!
copied = Copied. copied = Copied.
indev.popup = [accent]v6[] is currently in [accent]beta[].\n[lightgray]This means:[]\n[scarlet]- The campaign is unfinished[]\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
indev.notready = This part of the game isn't ready yet indev.notready = This part of the game isn't ready yet
indev.campaign = [accent]You've reached the end of the campaign![]\n\nThis is as far as the content goes. Interplanetary travel will be added in future updates. indev.campaign = [accent]Congratulations! You've reached the end of the campaign![]\n\nThis is as far as the content goes right now. Interplanetary travel will be added in future updates.
load.sound = Sounds load.sound = Sounds
load.map = Maps load.map = Maps
@@ -41,6 +41,14 @@ be.ignore = Ignore
be.noupdates = No updates found. be.noupdates = No updates found.
be.check = Check for updates be.check = Check for updates
mods.browser = Mod Browser
mods.browser.selected = Selected mod
mods.browser.add = Install
mods.browser.reinstall = Reinstall
mods.github.open = Repo
mods.browser.sortdate = Sort by recent
mods.browser.sortstars = Sort by stars
schematic = Schematic schematic = Schematic
schematic.add = Save Schematic... schematic.add = Save Schematic...
schematics = Schematics schematics = Schematics
@@ -70,7 +78,7 @@ stat.delivered = Resources Launched:
stat.playtime = Time Played:[accent] {0} stat.playtime = Time Played:[accent] {0}
stat.rank = Final Rank: [accent]{0} stat.rank = Final Rank: [accent]{0}
globalitems = [accent]Global Items globalitems = [accent]Total Items
map.delete = Are you sure you want to delete the map "[accent]{0}[]"? map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
level.highscore = High Score: [accent]{0} level.highscore = High Score: [accent]{0}
level.select = Level Select level.select = Level Select
@@ -84,6 +92,7 @@ joingame = Join Game
customgame = Custom Game customgame = Custom Game
newgame = New Game newgame = New Game
none = <none> none = <none>
none.found = [lightgray]<none found>
minimap = Minimap minimap = Minimap
position = Position position = Position
close = Close close = Close
@@ -100,21 +109,24 @@ preparingconfig = Preparing Config
preparingcontent = Preparing Content preparingcontent = Preparing Content
uploadingcontent = Uploading Content uploadingcontent = Uploading Content
uploadingpreviewfile = Uploading Preview File uploadingpreviewfile = Uploading Preview File
committingchanges = Comitting Changes committingchanges = Committing Changes
done = Done done = Done
feature.unsupported = Your device does not support this feature. feature.unsupported = Your device does not support this feature.
mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub. mods.initfailed = [red]⚠[] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]\n\nTo disable this feature, turn it off in [accent]Settings->Game->Disable Mods On Startup Crash[].
mods = Mods mods = Mods
mods.none = [lightgray]No mods found! mods.none = [lightgray]No mods found!
mods.guide = Modding Guide mods.guide = Modding Guide
mods.report = Report Bug mods.report = Report Bug
mods.openfolder = Open Folder mods.openfolder = Open Folder
mods.viewcontent = View Content
mods.reload = Reload mods.reload = Reload
mods.reloadexit = The game will now exit, to reload mods. mods.reloadexit = The game will now exit, to reload mods.
mod.installed = [[Installed]
mod.display = [gray]Mod:[orange] {0} mod.display = [gray]Mod:[orange] {0}
mod.enabled = [lightgray]Enabled mod.enabled = [lightgray]Enabled
mod.disabled = [scarlet]Disabled mod.disabled = [scarlet]Disabled
mod.multiplayer.compatible = [gray]Multiplayer Compatible
mod.disable = Disable mod.disable = Disable
mod.content = Content: mod.content = Content:
mod.delete.error = Unable to delete mod. File may be in use. mod.delete.error = Unable to delete mod. File may be in use.
@@ -147,8 +159,12 @@ planetmap = Planet Map
launchcore = Launch Core launchcore = Launch Core
filename = File Name: filename = File Name:
unlocked = New content unlocked! unlocked = New content unlocked!
available = New research available!
completed = [accent]Completed completed = [accent]Completed
techtree = Tech Tree techtree = Tech Tree
research.legacy = [accent]5.0[] research data found.\nDo you want to [accent]load this data[], or [accent]discard it[] and restart research in the new campaign (recommended)?
research.load = Load
research.discard = Discard
research.list = [lightgray]Research: research.list = [lightgray]Research:
research = Research research = Research
researched = [lightgray]{0} researched. researched = [lightgray]{0} researched.
@@ -193,6 +209,7 @@ servers.local = Local Servers
servers.remote = Remote Servers servers.remote = Remote Servers
servers.global = Community Servers servers.global = Community Servers
servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
servers.showhidden = Show Hidden Servers servers.showhidden = Show Hidden Servers
server.shown = Shown server.shown = Shown
server.hidden = Hidden server.hidden = Hidden
@@ -200,9 +217,11 @@ server.hidden = Hidden
trace = Trace Player trace = Trace Player
trace.playername = Player name: [accent]{0} trace.playername = Player name: [accent]{0}
trace.ip = IP: [accent]{0} trace.ip = IP: [accent]{0}
trace.id = Unique ID: [accent]{0} trace.id = ID: [accent]{0}
trace.mobile = Mobile Client: [accent]{0} trace.mobile = Mobile Client: [accent]{0}
trace.modclient = Custom Client: [accent]{0} trace.modclient = Custom Client: [accent]{0}
trace.times.joined = Times Joined: [accent]{0}
trace.times.kicked = Times Kicked: [accent]{0}
invalidid = Invalid client ID! Submit a bug report. invalidid = Invalid client ID! Submit a bug report.
server.bans = Bans server.bans = Bans
server.bans.none = No banned players found! server.bans.none = No banned players found!
@@ -230,6 +249,7 @@ disconnect.timeout = Timed out.
disconnect.data = Failed to load world data! disconnect.data = Failed to load world data!
cantconnect = Unable to join game ([accent]{0}[]). cantconnect = Unable to join game ([accent]{0}[]).
connecting = [accent]Connecting... connecting = [accent]Connecting...
reconnecting = [accent]Reconnecting...
connecting.data = [accent]Loading world data... connecting.data = [accent]Loading world data...
server.port = Port: server.port = Port:
server.addressinuse = Address already in use! server.addressinuse = Address already in use!
@@ -275,6 +295,7 @@ cancel = Cancel
openlink = Open Link openlink = Open Link
copylink = Copy Link copylink = Copy Link
back = Back back = Back
max = Max
crash.export = Export Crash Logs crash.export = Export Crash Logs
crash.none = No crash logs found. crash.none = No crash logs found.
crash.exported = Crash logs exported. crash.exported = Crash logs exported.
@@ -294,6 +315,7 @@ cancelbuilding = [accent][[{0}][] to clear plan
selectschematic = [accent][[{0}][] to select+copy selectschematic = [accent][[{0}][] to select+copy
pausebuilding = [accent][[{0}][] to pause building pausebuilding = [accent][[{0}][] to pause building
resumebuilding = [scarlet][[{0}][] to resume building resumebuilding = [scarlet][[{0}][] to resume building
enablebuilding = [scarlet][[{0}][] to enable building
showui = UI hidden.\nPress [accent][[{0}][] to show UI. showui = UI hidden.\nPress [accent][[{0}][] to show UI.
wave = [accent]Wave {0} wave = [accent]Wave {0}
wave.cap = [accent]Wave {0}/{1} wave.cap = [accent]Wave {0}/{1}
@@ -349,7 +371,6 @@ editor.center = Center
workshop = Workshop workshop = Workshop
waves.title = Waves waves.title = Waves
waves.remove = Remove waves.remove = Remove
waves.never = <never>
waves.every = every waves.every = every
waves.waves = wave(s) waves.waves = wave(s)
waves.perspawn = per spawn waves.perspawn = per spawn
@@ -378,7 +399,7 @@ editor.removeunit = Remove Unit
editor.teams = Teams editor.teams = Teams
editor.errorload = Error loading file. editor.errorload = Error loading file.
editor.errorsave = Error saving file. editor.errorsave = Error saving file.
editor.errorimage = That's an image, not a map.\n\nIf you want to import a 3.5/build 40 map, use the 'Import Legacy Map' button in the editor. editor.errorimage = That's an image, not a map.
editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported. editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
editor.errornot = This is not a map file. editor.errornot = This is not a map file.
editor.errorheader = This map file is either not valid or corrupt. editor.errorheader = This map file is either not valid or corrupt.
@@ -497,10 +518,10 @@ requirement.produce = Produce {0}
requirement.capture = Capture {0} requirement.capture = Capture {0}
launch.text = Launch launch.text = Launch
research.multiplayer = Only the host can research items. research.multiplayer = Only the host can research items.
map.multiplayer = Only the host can view sectors.
uncover = Uncover uncover = Uncover
configure = Configure Loadout configure = Configure Loadout
#TODO
loadout = Loadout loadout = Loadout
resources = Resources resources = Resources
bannedblocks = Banned Blocks bannedblocks = Banned Blocks
@@ -508,12 +529,6 @@ addall = Add All
launch.from = Launching From: [accent]{0} launch.from = Launching From: [accent]{0}
launch.destination = Destination: {0} launch.destination = Destination: {0}
configure.invalid = Amount must be a number between 0 and {0}. configure.invalid = Amount must be a number between 0 and {0}.
zone.unlocked = [lightgray]{0} unlocked.
zone.requirement.complete = Requirement for {0} completed:[lightgray]\n{1}
zone.resources = [lightgray]Resources Detected:
zone.objective = [lightgray]Objective: [accent]{0}
zone.objective.survival = Survive
zone.objective.attack = Destroy Enemy Core
add = Add... add = Add...
boss.health = Guardian Health boss.health = Guardian Health
@@ -547,8 +562,13 @@ sectors.launch = Launch
sectors.select = Select sectors.select = Select
sectors.nonelaunch = [lightgray]none (sun) sectors.nonelaunch = [lightgray]none (sun)
sectors.rename = Rename Sector sectors.rename = Rename Sector
sectors.enemybase = [scarlet]Enemy Base
sectors.vulnerable = [scarlet]Vulnerable
sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
sectors.survives = [accent]Survives {0} waves
sectors.go = Go
sector.curcapture = Sector Captured sector.curcapture = Sector Captured
sector.curlost = Sector Lost
sector.missingresources = [scarlet]Insufficient Core Resources sector.missingresources = [scarlet]Insufficient Core Resources
sector.attacked = Sector [accent]{0}[white] under attack! sector.attacked = Sector [accent]{0}[white] under attack!
sector.lost = Sector [accent]{0}[white] lost! sector.lost = Sector [accent]{0}[white] lost!
@@ -589,11 +609,16 @@ sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats
sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills. sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology. sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units. sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost. sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Mace units. Destroy it.
sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible. sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks. sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers. sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores. sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
settings.language = Language settings.language = Language
settings.data = Game Data settings.data = Game Data
@@ -662,6 +687,7 @@ stat.drillspeed = Base Drill Speed
stat.boosteffect = Boost Effect stat.boosteffect = Boost Effect
stat.maxunits = Max Active Units stat.maxunits = Max Active Units
stat.health = Health stat.health = Health
stat.armor = Armor
stat.buildtime = Build Time stat.buildtime = Build Time
stat.maxconsecutive = Max Consecutive stat.maxconsecutive = Max Consecutive
stat.buildcost = Build Cost stat.buildcost = Build Cost
@@ -677,6 +703,7 @@ stat.lightningchance = Lightning Chance
stat.lightningdamage = Lightning Damage stat.lightningdamage = Lightning Damage
stat.flammability = Flammability stat.flammability = Flammability
stat.radioactivity = Radioactivity stat.radioactivity = Radioactivity
stat.charge = Charge
stat.heatcapacity = Heat Capacity stat.heatcapacity = Heat Capacity
stat.viscosity = Viscosity stat.viscosity = Viscosity
stat.temperature = Temperature stat.temperature = Temperature
@@ -689,6 +716,7 @@ stat.commandlimit = Command Limit
stat.abilities = Abilities stat.abilities = Abilities
stat.canboost = Can Boost stat.canboost = Can Boost
stat.flying = Flying stat.flying = Flying
stat.ammouse = Ammo Use
ability.forcefield = Force Field ability.forcefield = Force Field
ability.repairfield = Repair Field ability.repairfield = Repair Field
@@ -703,6 +731,7 @@ bar.corereq = Core Base Required
bar.drillspeed = Drill Speed: {0}/s bar.drillspeed = Drill Speed: {0}/s
bar.pumpspeed = Pump Speed: {0}/s bar.pumpspeed = Pump Speed: {0}/s
bar.efficiency = Efficiency: {0}% bar.efficiency = Efficiency: {0}%
bar.boost = Boost: {0}%
bar.powerbalance = Power: {0}/s bar.powerbalance = Power: {0}/s
bar.powerstored = Stored: {0}/{1} bar.powerstored = Stored: {0}/{1}
bar.poweramount = Power: {0} bar.poweramount = Power: {0}
@@ -711,7 +740,6 @@ bar.powerlines = Connections: {0}/{1}
bar.items = Items: {0} bar.items = Items: {0}
bar.capacity = Capacity: {0} bar.capacity = Capacity: {0}
bar.unitcap = {0} {1}/{2} bar.unitcap = {0} {1}/{2}
bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
bar.liquid = Liquid bar.liquid = Liquid
bar.heat = Heat bar.heat = Heat
bar.power = Power bar.power = Power
@@ -728,6 +756,7 @@ bullet.sapping = [stat]sapping
bullet.homing = [stat]homing bullet.homing = [stat]homing
bullet.shock = [stat]shock bullet.shock = [stat]shock
bullet.frag = [stat]frag bullet.frag = [stat]frag
bullet.buildingdamage = [stat]{0}%[lightgray] building damage
bullet.knockback = [stat]{0}[lightgray] knockback bullet.knockback = [stat]{0}[lightgray] knockback
bullet.pierce = [stat]{0}[lightgray]x pierce bullet.pierce = [stat]{0}[lightgray]x pierce
bullet.infinitepierce = [stat]pierce bullet.infinitepierce = [stat]pierce
@@ -756,6 +785,7 @@ unit.items = items
unit.thousands = k unit.thousands = k
unit.millions = mil unit.millions = mil
unit.billions = b unit.billions = b
unit.pershot = /shot
category.purpose = Purpose category.purpose = Purpose
category.general = General category.general = General
category.power = Power category.power = Power
@@ -769,9 +799,12 @@ setting.shadows.name = Shadows
setting.blockreplace.name = Automatic Block Suggestions setting.blockreplace.name = Automatic Block Suggestions
setting.linear.name = Linear Filtering setting.linear.name = Linear Filtering
setting.hints.name = Hints setting.hints.name = Hints
setting.logichints.name = Logic Hints
setting.flow.name = Display Resource Flow Rate setting.flow.name = Display Resource Flow Rate
setting.backgroundpause.name = Pause In Background setting.backgroundpause.name = Pause In Background
setting.buildautopause.name = Auto-Pause Building setting.buildautopause.name = Auto-Pause Building
setting.doubletapmine.name = Double-Tap to Mine
setting.modcrashdisable.name = Disable Mods On Startup Crash
setting.animatedwater.name = Animated Surfaces setting.animatedwater.name = Animated Surfaces
setting.animatedshields.name = Animated Shields setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[lightgray] (requires restart)[] setting.antialias.name = Antialias[lightgray] (requires restart)[]
@@ -799,7 +832,6 @@ setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
setting.sensitivity.name = Controller Sensitivity setting.sensitivity.name = Controller Sensitivity
setting.saveinterval.name = Save Interval setting.saveinterval.name = Save Interval
setting.seconds = {0} seconds setting.seconds = {0} seconds
setting.blockselecttimeout.name = Block Select Timeout
setting.milliseconds = {0} milliseconds setting.milliseconds = {0} milliseconds
setting.fullscreen.name = Fullscreen setting.fullscreen.name = Fullscreen
setting.borderlesswindow.name = Borderless Window[lightgray] (restart may be required) setting.borderlesswindow.name = Borderless Window[lightgray] (restart may be required)
@@ -808,7 +840,7 @@ setting.smoothcamera.name = Smooth Camera
setting.vsync.name = VSync setting.vsync.name = VSync
setting.pixelate.name = Pixelate setting.pixelate.name = Pixelate
setting.minimap.name = Show Minimap setting.minimap.name = Show Minimap
setting.coreitems.name = Display Core Items (WIP) setting.coreitems.name = Display Core Items
setting.position.name = Show Player Position setting.position.name = Show Player Position
setting.musicvol.name = Music Volume setting.musicvol.name = Music Volume
setting.atmosphere.name = Show Planet Atmosphere setting.atmosphere.name = Show Planet Atmosphere
@@ -824,7 +856,9 @@ setting.chatopacity.name = Chat Opacity
setting.lasersopacity.name = Power Laser Opacity setting.lasersopacity.name = Power Laser Opacity
setting.bridgeopacity.name = Bridge Opacity setting.bridgeopacity.name = Bridge Opacity
setting.playerchat.name = Display Player Bubble Chat setting.playerchat.name = Display Player Bubble Chat
setting.showweather.name = Show Weather Graphics
public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility. public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
public.confirm.really = If you want to play with friends, use [green]Invite Friend[] instead of a [scarlet]Public server[]!\nAre you sure you want to make your game [scarlet]public[]?
public.beta = Note that beta versions of the game cannot make public lobbies. public.beta = Note that beta versions of the game cannot make public lobbies.
uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds... uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
uiscale.cancel = Cancel & Exit uiscale.cancel = Cancel & Exit
@@ -888,6 +922,8 @@ keybind.menu.name = Menu
keybind.pause.name = Pause keybind.pause.name = Pause
keybind.pause_building.name = Pause/Resume Building keybind.pause_building.name = Pause/Resume Building
keybind.minimap.name = Minimap keybind.minimap.name = Minimap
keybind.planet_map.name = Planet Map
keybind.research.name = Research
keybind.chat.name = Chat keybind.chat.name = Chat
keybind.player_list.name = Player List keybind.player_list.name = Player List
keybind.console.name = Console keybind.console.name = Console
@@ -897,6 +933,7 @@ keybind.toggle_menus.name = Toggle Menus
keybind.chat_history_prev.name = Chat History Prev keybind.chat_history_prev.name = Chat History Prev
keybind.chat_history_next.name = Chat History Next keybind.chat_history_next.name = Chat History Next
keybind.chat_scroll.name = Chat Scroll keybind.chat_scroll.name = Chat Scroll
keybind.chat_mode.name = Change Chat Mode
keybind.drop_unit.name = Drop Unit keybind.drop_unit.name = Drop Unit
keybind.zoom_minimap.name = Zoom Minimap keybind.zoom_minimap.name = Zoom Minimap
mode.help.title = Description of modes mode.help.title = Description of modes
@@ -913,6 +950,7 @@ mode.custom = Custom Rules
rules.infiniteresources = Infinite Resources rules.infiniteresources = Infinite Resources
rules.reactorexplosions = Reactor Explosions rules.reactorexplosions = Reactor Explosions
rules.coreincinerates = Core Incinerates Overflow
rules.schematic = Schematics Allowed rules.schematic = Schematics Allowed
rules.wavetimer = Wave Timer rules.wavetimer = Wave Timer
rules.waves = Waves rules.waves = Waves
@@ -924,6 +962,8 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unithealthmultiplier = Unit Health Multiplier rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles) rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
rules.wavespacing = Wave Spacing:[lightgray] (sec) rules.wavespacing = Wave Spacing:[lightgray] (sec)
rules.buildcostmultiplier = Build Cost Multiplier rules.buildcostmultiplier = Build Cost Multiplier
@@ -945,6 +985,7 @@ rules.explosions = Block/Unit Explosion Damage
rules.ambientlight = Ambient Light rules.ambientlight = Ambient Light
rules.weather = Weather rules.weather = Weather
rules.weather.frequency = Frequency: rules.weather.frequency = Frequency:
rules.weather.always = Always
rules.weather.duration = Duration: rules.weather.duration = Duration:
content.item.name = Items content.item.name = Items
@@ -1012,6 +1053,7 @@ block.resupply-point.name = Resupply Point
block.parallax.name = Parallax block.parallax.name = Parallax
block.cliff.name = Cliff block.cliff.name = Cliff
block.sand-boulder.name = Sand Boulder block.sand-boulder.name = Sand Boulder
block.basalt-boulder.name = Basalt Boulder
block.grass.name = Grass block.grass.name = Grass
block.slag.name = Slag block.slag.name = Slag
block.space.name = Space block.space.name = Space
@@ -1149,7 +1191,7 @@ block.item-void.name = Item Void
block.liquid-source.name = Liquid Source block.liquid-source.name = Liquid Source
block.liquid-void.name = Liquid Void block.liquid-void.name = Liquid Void
block.power-void.name = Power Void block.power-void.name = Power Void
block.power-source.name = Power Infinite block.power-source.name = Power Source
block.unloader.name = Unloader block.unloader.name = Unloader
block.vault.name = Vault block.vault.name = Vault
block.wave.name = Wave block.wave.name = Wave
@@ -1234,27 +1276,45 @@ team.derelict.name = derelict
team.green.name = green team.green.name = green
team.purple.name = purple team.purple.name = purple
tutorial.next = [lightgray]<Tap to continue> hint.skip = Skip
tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse[accent] [[WASD][] to move.\n[accent]Scroll[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper hint.desktopMove = Use [accent][[WASD][] to move.
tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper hint.zoom = [accent]Scroll[] to zoom in or out.
tutorial.drill = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\nYou can also select the drill by tapping [accent][[2][] then [accent][[1][] quickly, regardless of which tab is open.\n[accent]Right-click[] to stop building. hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually.
tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement. hint.desktopShoot = [accent][[Left-click][] to shoot.
tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[] hint.depositItems = To transfer items, drag from your ship to the core.
tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\nUse the scrollwheel to rotate blocks before placing them.\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core. hint.respawn = To respawn as a ship, press [accent][[V][].
tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core. hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
tutorial.turret = Once an item enters your core, it can be used for building.\nKeep in mind that not all items can be used for building.\nItems that are not used for building, such as[accent] coal[] or[accent] scrap[], cannot be put into the core.\nDefensive structures must be built to repel the[lightgray] enemy[].\nBuild a[accent] duo turret[] near your base. hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
tutorial.drillturret = Duo turrets require[accent] copper ammo[] to shoot.\nPlace a drill near the turret.\nLead conveyors into the turret to supply it with copper.\n\n[accent]Ammo delivered: 0/1 hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it.
tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause. hint.placeDrill.mobile = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause. hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
tutorial.unpause = Now press space again to unpause. hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors.
tutorial.unpause.mobile = Now press it again to unpause. hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them.
tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection. hint.breaking = [accent]Right-click[] and drag to break blocks.
tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection. hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[] hint.research = Use the \ue875 [accent]Research[] button to research new technology.
tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[] hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
tutorial.waves = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves.[accent] Click[] to shoot.\nBuild more turrets and drills. Mine more copper. hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper. hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese obtained resources can then be used to research new technology.\n\n[accent]Press the launch button. hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
hint.command = Press [accent][[G][] to command nearby units of [accent]similar type[] into formation.\n\nTo command ground units, you must first control another ground unit.
hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation.
hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
hint.payloadDrop = Press [accent]][] to drop a payload.
hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a  [accent]Foundation[] core over the  [accent]Shard[] core. Make sure it is free from nearby obstructions.
hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
hint.coopCampaign = When playing the [accent]co-op campaign[], items that are produced in the current map will also be sent [accent]to your local sectors[].\n\nAny new research done by the host also carries over.
item.copper.description = Used in all types of construction and ammunition. item.copper.description = Used in all types of construction and ammunition.
item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced. item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
@@ -1339,8 +1399,8 @@ block.inverted-sorter.description = Similar to a standard sorter, but outputs se
block.router.description = Distributes input items to 3 output directions equally. block.router.description = Distributes input items to 3 output directions equally.
block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output. block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
block.distributor.description = Distributes input items to 7 output directions equally. block.distributor.description = Distributes input items to 7 output directions equally.
block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates. block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked.
block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates. block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked.
block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers. block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers.
block.mechanical-pump.description = Pumps and outputs liquids. Does not require power. block.mechanical-pump.description = Pumps and outputs liquids. Does not require power.
block.rotary-pump.description = Pumps and outputs liquids. Requires power. block.rotary-pump.description = Pumps and outputs liquids. Requires power.
@@ -1400,7 +1460,7 @@ block.ripple.description = Shoots clusters of shells at ground enemies over long
block.cyclone.description = Fires explosive clumps of flak at nearby enemies. block.cyclone.description = Fires explosive clumps of flak at nearby enemies.
block.spectre.description = Fires large armor-piercing bullets at air and ground targets. block.spectre.description = Fires large armor-piercing bullets at air and ground targets.
block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate. block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
block.foreshadow.description = Fires a large single-target bolt over long distances. block.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
block.repair-point.description = Continuously repairs the closest damaged unit in its vicinity. block.repair-point.description = Continuously repairs the closest damaged unit in its vicinity.
block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process. block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
@@ -1436,7 +1496,7 @@ unit.reign.description = Fires a barrage of massive piercing bullets at all near
unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight. unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight. unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded. unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repair allied structures. Capable of flight. unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain. unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion. unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain. unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
@@ -1449,7 +1509,7 @@ unit.zenith.description = Fires salvos of missiles at all nearby enemies.
unit.antumbra.description = Fires a barrage of bullets at all nearby enemies. unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies. unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
unit.mono.description = Automatically mines copper and lead, depositing it into the core. unit.mono.description = Automatically mines copper and lead, depositing it into the core.
unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction. unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units. unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units. unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units. unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
@@ -1461,3 +1521,146 @@ unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Co
unit.alpha.description = Defends the Shard core from enemies. Builds structures. unit.alpha.description = Defends the Shard core from enemies. Builds structures.
unit.beta.description = Defends the Foundation core from enemies. Builds structures. unit.beta.description = Defends the Foundation core from enemies. Builds structures.
unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
lst.read = Read a number from a linked memory cell.
lst.write = Write a number to a linked memory cell.
lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
lst.drawflush = Flush queued [accent]Draw[] operations to a display.
lst.printflush = Flush queued [accent]Print[] operations to a message block.
lst.getlink = Get a processor link by index. Starts at 0.
lst.control = Control a building.
lst.radar = Locate units around a building with range.
lst.sensor = Get data from a building or unit.
lst.set = Set a variable.
lst.operation = Perform an operation on 1-2 variables.
lst.end = Jump to the top of the instruction stack.
lst.jump = Conditionally jump to another statement.
lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
lst.unitcontrol = Control the currently bound unit.
lst.unitradar = Locate units around the currently bound unit.
lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
logic.nounitbuild = [red]Unit building logic is not allowed here.
lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
lenum.shoot = Shoot at a position.
lenum.shootp = Shoot at a unit/building with velocity prediction.
lenum.configure = Building configuration, e.g. sorter item.
lenum.enabled = Whether the block is enabled.
laccess.color = Illuminator color.
laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
laccess.dead = Whether a unit/building is dead or no longer valid.
laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
laccess.commanded = [red]Deprecated. Will be removed![]\nUse [accent]controlled[] instead.
graphicstype.clear = Fill the display with a color.
graphicstype.color = Set color for next drawing operations.
graphicstype.stroke = Set line width.
graphicstype.line = Draw line segment.
graphicstype.rect = Fill a rectangle.
graphicstype.linerect = Draw a rectangle outline.
graphicstype.poly = Fill a regular polygon.
graphicstype.linepoly = Draw a regular polygon outline.
graphicstype.triangle = Fill a triangle.
graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
lenum.always = Always true.
lenum.idiv = Integer division.
lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
lenum.mod = Modulo.
lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
lenum.notequal = Not equal. Coerces types.
lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
lenum.shl = Bit-shift left.
lenum.shr = Bit-shift right.
lenum.or = Bitwise OR.
lenum.land = Logical AND.
lenum.and = Bitwise AND.
lenum.not = Bitwise flip.
lenum.xor = Bitwise XOR.
lenum.min = Minimum of two numbers.
lenum.max = Maximum of two numbers.
lenum.angle = Angle of vector in degrees.
lenum.len = Length of vector.
lenum.sin = Sine, in degrees.
lenum.cos = Cosine, in degrees.
lenum.tan = Tangent, in degrees.
#not a typo, look up 'range notation'
lenum.rand = Random decimal in range [0, value).
lenum.log = Natural logarithm (ln).
lenum.log10 = Base 10 logarithm.
lenum.noise = 2D simplex noise.
lenum.abs = Absolute value.
lenum.sqrt = Square root.
lenum.any = Any unit.
lenum.ally = Ally unit.
lenum.attacker = Unit with a weapon.
lenum.enemy = Enemy unit.
lenum.boss = Guardian unit.
lenum.flying = Flying unit.
lenum.ground = Ground unit.
lenum.player = Unit controlled by a player.
lenum.ore = Ore deposit.
lenum.damaged = Damaged ally building.
lenum.spawn = Enemy spawn point.\nMay be a core or a position.
lenum.building = Building in a specific group.
lenum.core = Any core.
lenum.storage = Storage building, e.g. Vault.
lenum.generator = Buildings that generate power.
lenum.factory = Buildings that transform resources.
lenum.repair = Repair points.
lenum.rally = Command center.
lenum.battery = Any battery.
lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
lenum.reactor = Impact/Thorium reactor.
lenum.turret = Any turret.
sensor.in = The building/unit to sense.
radar.from = Building to sense from.\nSensor range is limited by building range.
radar.target = Filter for units to sense.
radar.and = Additional filters.
radar.order = Sorting order. 0 to reverse.
radar.sort = Metric to sort results by.
radar.output = Variable to write output unit to.
unitradar.target = Filter for units to sense.
unitradar.and = Additional filters.
unitradar.order = Sorting order. 0 to reverse.
unitradar.sort = Metric to sort results by.
unitradar.output = Variable to write output unit to.
control.of = Building to control.
control.unit = Unit/building to aim at.
control.shoot = Whether to shoot.
unitlocate.enemy = Whether to locate enemy buildings.
unitlocate.found = Whether the object was found.
unitlocate.building = Output variable for located building.
unitlocate.outx = Output X coordinate.
unitlocate.outy = Output Y coordinate.
unitlocate.group = Building group to look for.
lenum.idle = Don't move, but keep building/mining.\nThe default state.
lenum.stop = Stop moving/mining/building.
lenum.move = Move to exact position.
lenum.approach = Approach a position with a radius.
lenum.pathfind = Pathfind to the enemy spawn.
lenum.target = Shoot a position.
lenum.targetp = Shoot a target with velocity prediction.
lenum.itemdrop = Drop an item.
lenum.itemtake = Take an item from a building.
lenum.paydrop = Drop current payload.
lenum.paytake = Pick up payload at current location.
lenum.flag = Numeric unit flag.
lenum.mine = Mine at a position.
lenum.build = Build a structure.
lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
lenum.within = Check if unit is near a position.
lenum.boost = Start/stop boosting.

View File

@@ -1,4 +1,4 @@
credits.text = Стваральнiк [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЁсць недапрацоўкі ў перакладзе або хочаце знайсці саюзнікаў для сумеснай гульні?\nПішыце ў аф. [accent]discord-сервер Mindustry[] у канал [accent]#translations[].\n\nРэдактар і перакладчык на беларускую мову:\n[cyan]K[gray]evi[cyan]TV[gray]#9923 credits.text = Стваральнiк [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЁсць недапрацоўкі ў перакладзе або хочаце знайсці саюзнікаў для сумеснай гульні?\nПішыце ў аф. [accent]discord-сервер Mindustry[] у канал [accent]#translations[].\n\nРэдактар і перакладчык на беларускую мову:\n[cyan]K[gray]evi[cyan]TV[gray]#9923\nVit_log выправіў памылкі і дапоўніў пераклад.
credits = Аўтары credits = Аўтары
contributors = Перакладчык contributors = Перакладчык
discord = Далучайцеся да нашага Discord! discord = Далучайцеся да нашага Discord!
@@ -20,8 +20,8 @@ gameover = Гульня скончана
gameover.pvp = [accent]{0}[] каманда перамагла! gameover.pvp = [accent]{0}[] каманда перамагла!
highscore = [accent]Новы рэкорд! highscore = [accent]Новы рэкорд!
copied = Скапіявана. copied = Скапіявана.
indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. indev.popup = [accent]в6[] яшчэ в [accent]альфе[].\n[lightgray]Гэта значыць:[]\n[scarlet]- Кампанія не завершана[]\n- Часткі гульні адсутнічаюць\n - Большая частка [scarlet]ШІ юнітав[] можа працаваць не правільна\n- Мноства юнітав не дароблена\n- Ўсё што тут ёсць можа быць ізменена.\n\nАб багах і крашах пісаць на [accent]Github[].
indev.notready = This part of the game isn't ready yet indev.notready = Гэта частка гульні яшчэ не зроблена.
load.sound = Звукі load.sound = Звукі
load.map = Карты load.map = Карты
@@ -41,8 +41,8 @@ be.check = Праверыць абнаўленні
schematic = Схема schematic = Схема
schematic.add = Захаваць схему... schematic.add = Захаваць схему...
schematics = Схемы schematics = Схемы
schematic.replace = A schematic by that name already exists. Replace it? schematic.replace = Схема с данным імем ўжо існуе. Замяніць яе?
schematic.exists = A schematic by that name already exists. schematic.exists = Схема с данным імем ўжо існуе.
schematic.import = Імпартаваць схему... schematic.import = Імпартаваць схему...
schematic.exportfile = Экспартаваць файл schematic.exportfile = Экспартаваць файл
schematic.importfile = Імпартаваць файл schematic.importfile = Імпартаваць файл
@@ -55,7 +55,7 @@ schematic.saved = Схема захавана.
schematic.delete.confirm = Гэтая схема будзе выдалена. schematic.delete.confirm = Гэтая схема будзе выдалена.
schematic.rename = Перайменаваць схему schematic.rename = Перайменаваць схему
schematic.info = {0}x{1}, {2} блокаў schematic.info = {0}x{1}, {2} блокаў
schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server. schematic.disabled = [scarlet]Схемы забаронены[]\nВам нельга выкарыстоўваць схемы на гэтай [accent]карце[] альбо [accent]серверы.
stat.wave = Хваляў адлюстравана:[accent] {0} stat.wave = Хваляў адлюстравана:[accent] {0}
stat.enemiesDestroyed = Ворагаў знішчана:[accent] {0} stat.enemiesDestroyed = Ворагаў знішчана:[accent] {0}
@@ -103,19 +103,19 @@ feature.unsupported = Ваша прылада не падтрымлівае гэ
mods.alphainfo = Майце на ўвазе, што мадыфікацыі знаходзяцца ў альфа-версіі і [scarlet]могуць утрымліваць шмат памылак[]. Дакладвайце аб любых праблемах, якія Вы знойдзеце ў Mindustry Github або Discord. mods.alphainfo = Майце на ўвазе, што мадыфікацыі знаходзяцца ў альфа-версіі і [scarlet]могуць утрымліваць шмат памылак[]. Дакладвайце аб любых праблемах, якія Вы знойдзеце ў Mindustry Github або Discord.
mods = Мадыфікацыі mods = Мадыфікацыі
mods.none = [lightgray]Мадыфікацыі не знойдзены! mods.none = [lightgray]Мадыфікацыі не знойдзены!
mods.guide = Кіраўніцтва па модам mods.guide = Кіраўніцтва па мадам
mods.report = Паведаміць пра памылку mods.report = Паведаміць пра памылку
mods.openfolder = Адкрыць тэчку з мадыфікацыямі mods.openfolder = Адкрыць тэчку з мадыфікацыямі
mods.reload = Reload mods.reload = Reload
mods.reloadexit = The game will now exit, to reload mods. mods.reloadexit = Гульня зараз закроецца, каб ўсталяваць мады.
mod.display = [gray]Мадыфікацыя:[orange] {0} mod.display = [gray]Мадыфікацыя:[orange] {0}
mod.enabled = [lightgray]Уключана mod.enabled = [lightgray]Уключана
mod.disabled = [scarlet]Выключана mod.disabled = [scarlet]Выключана
mod.disable = Выкл. mod.disable = Выкл.
mod.content = Content: mod.content = Змест:
mod.delete.error = Немагчыма выдаліць мадыфікацыю. Магчыма, файл выкарыстоўваецца. mod.delete.error = Немагчыма выдаліць мадыфікацыю. Магчыма, файл выкарыстоўваецца.
mod.requiresversion = [scarlet]Мінімальная патрабаваная версія гульні: [accent]{0} mod.requiresversion = [scarlet]Мінімальная патрабаваная версія гульні: [accent]{0}
mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105) mod.outdated = [scarlet]Не сумяшчальна з в6 (няма minGameVersion: 105)
mod.missingdependencies = [scarlet]Не знойдзены бацькоўскія мадыфікацыі: {0} mod.missingdependencies = [scarlet]Не знойдзены бацькоўскія мадыфікацыі: {0}
mod.erroredcontent = [scarlet]Памылкі змесціва mod.erroredcontent = [scarlet]Памылкі змесціва
mod.errors = Памылкі былі выкліканыя загружаным змесцівам. mod.errors = Памылкі былі выкліканыя загружаным змесцівам.
@@ -127,20 +127,20 @@ mod.reloadrequired = [scarlet]Неабходны перазапуск
mod.import = Імпартаваць мадыфікацыю mod.import = Імпартаваць мадыфікацыю
mod.import.file = Import File mod.import.file = Import File
mod.import.github = Імпартаваць мод з GitHub mod.import.github = Імпартаваць мод з GitHub
mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source! mod.jarwarn = [scarlet]JAR-мады не бяспечны па прынцыпу.[]\nПраверце, што імпартуеце гэты мод с надзейнай крыніцы!
mod.item.remove = Гэты прадмет з’яўляецца часткай мадыфікацыі [accent]«{0}»[]. Каб выдаліць яго, выдаліце саму мадыфікацыю. mod.item.remove = Гэты прадмет з’яўляецца часткай мадыфікацыі [accent]«{0}»[]. Каб выдаліць яго, выдаліце саму мадыфікацыю.
mod.remove.confirm = Гэтая мадыфікацыя будзе выдалена. mod.remove.confirm = Гэтая мадыфікацыя будзе выдалена.
mod.author = [lightgray]Аўтар:[] {0} mod.author = [lightgray]Аўтар:[] {0}
mod.missing = Гэта захаванне ўтрымлівае мадыфікацыю, якое вы нядаўна абнавілі ці яна больш не ўсталяваная. Можа здарыцца пашкоджанне захавання. Вы ўпэўненыя, што хочаце загрузіць яго?\n[lightgray]Мадыфікацыі:\n{0} mod.missing = Гэта захаванне ўтрымлівае мадыфікацыю, якое вы нядаўна абнавілі ці яна больш не ўсталяваная. Можа здарыцца пашкоджанне захавання. Вы ўпэўненыя, што хочаце загрузіць яго?\n[lightgray]Мадыфікацыі:\n{0}
mod.preview.missing = Перад публікацыяй гэтай мадыфікацыі ў майстэрні, вы павінны дадаць малюнак прадпрагляду.\nРазмесціце малюнак з імем[accent] preview.png[] у тэчцы мадыфікацыі і паспрабуйце зноў. mod.preview.missing = Перад публікацыяй гэтай мадыфікацыі ў майстэрні, вы павінны дадаць малюнак прадпрагляду.\nРазмесціце малюнак з імем[accent] preview.png[] у тэчцы мадыфікацыі і паспрабуйце зноў.
mod.folder.missing = Мадыфікацыі могуць быць апублікаваныя ў майстэрні толькі ў выглядзе тэчкі.\nКаб канвертаваць любы мод у тэчку, проста выміце яго з архіва і выдаліце стары архіў .zip, затым перазапусціце гульню ці перазагрузіце мадыфікацыі. mod.folder.missing = Мадыфікацыі могуць быць апублікаваныя ў майстэрні толькі ў выглядзе тэчкі.\nКаб канвертаваць любы мод у тэчку, проста выміце яго з архіва і выдаліце стары архіў .zip, затым перазапусціце гульню ці перазагрузіце мадыфікацыі.
mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game. mod.scripts.disable = Ваша прылада не падтрымлівае мадыфікацыі з скріптамі. Выключайце такіе мады, как гуляць.
about.button = Аб гульні about.button = Аб гульні
name = Імя: name = Імя:
noname = Для пачатку, прыдумайце[accent] сабе iмя[]. noname = Для пачатку, прыдумайце[accent] сабе iмя[].
planetmap = Planet Map planetmap = Карта планеты
launchcore = Launch Core launchcore = Запусціць ядро
filename = Iмя файла: filename = Iмя файла:
unlocked = Новы кантэнт адмыкнуты! unlocked = Новы кантэнт адмыкнуты!
completed = [accent]Завершаны completed = [accent]Завершаны
@@ -148,12 +148,12 @@ techtree = Дрэва\n тэхналогій
research.list = [lightgray]Дасьледуйце: research.list = [lightgray]Дасьледуйце:
research = Даследаваць research = Даследаваць
researched = [lightgray] {0} даследавана. researched = [lightgray] {0} даследавана.
research.progress = {0}% complete research.progress = {0}% завершана
players = Гульцоў: {0} players = Гульцоў: {0}
players.single = {0} гулец players.single = {0} гулец
players.search = search players.search = search
players.notfound = [gray]no players found players.notfound = [gray]гульцоу не знойдзена
server.closing = [accent] Закрыццё сервера… server.closing = [accent]Закрыццё сервера…
server.kicked.kick = Вас выгналі з сервера! server.kicked.kick = Вас выгналі з сервера!
server.kicked.whitelist = Вы не ў белым спісе сервера. server.kicked.whitelist = Вы не ў белым спісе сервера.
server.kicked.serverClose = Сервер зачынены. server.kicked.serverClose = Сервер зачынены.
@@ -278,7 +278,7 @@ quit.confirm.tutorial = Вы ўпэўненыя, што ведаеце, што
loading = [accent]Загрузка… loading = [accent]Загрузка…
reloading = [accent]Перазагрузка мадыфікацый... reloading = [accent]Перазагрузка мадыфікацый...
saving = [accent]Захаванне… saving = [accent]Захаванне…
respawn = [accent][[{0}][] to respawn in core respawn = [accent][[{0}][] да вазраджэння з ядра
cancelbuilding = [accent][[{0}][] для ачысткі плана cancelbuilding = [accent][[{0}][] для ачысткі плана
selectschematic = [accent][[{0}][] вылучыць і скапіяваць selectschematic = [accent][[{0}][] вылучыць і скапіяваць
pausebuilding = [accent][[{0}][] для прыпынення будаўніцтва pausebuilding = [accent][[{0}][] для прыпынення будаўніцтва
@@ -291,8 +291,8 @@ waiting = [lightgray]Чаканне…
waiting.players = Чаканне гульцоў… waiting.players = Чаканне гульцоў…
wave.enemies = Ворагаў: [lightgray]{0} wave.enemies = Ворагаў: [lightgray]{0}
wave.enemy = Застаўся [lightgray]{0}[] ворагаў wave.enemy = Застаўся [lightgray]{0}[] ворагаў
wave.guardianwarn = Guardian approaching in [accent]{0}[] waves. wave.guardianwarn = Вартаўнік будзе пасля [accent]{0}[] хвалей.
wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave. wave.guardianwarn.one = Вартаўнік будзе пасля [accent]{0}[] хвалі.
loadimage = Загрузіць малюнак loadimage = Загрузіць малюнак
saveimage = Захаваць малюнак saveimage = Захаваць малюнак
unknown = Невядома unknown = Невядома
@@ -339,9 +339,9 @@ waves.never = <ніколі>
waves.every = кожны waves.every = кожны
waves.waves = хваля (ы) waves.waves = хваля (ы)
waves.perspawn = за з’яўленне waves.perspawn = за з’яўленне
waves.shields = shields/wave waves.shields = адзінак шчыта/хвалю
waves.to = да waves.to = да
waves.guardian = Guardian waves.guardian = Вартаўнік
waves.preview = Папярэдні прагляд waves.preview = Папярэдні прагляд
waves.edit = Рэдагавацью... waves.edit = Рэдагавацью...
waves.copy = Капіяваць у буфер абмену waves.copy = Капіяваць у буфер абмену
@@ -350,9 +350,9 @@ waves.invalid = Няслушныя хвалі ў буферы абмену.
waves.copied = Хвалі скапіяваныя. waves.copied = Хвалі скапіяваныя.
waves.none = Ворагі не былі вызначаныя. \nЗвярнiце ўвагу, што пустыя хвалі будуць аўтаматычна замененыя звычайнай хваляй. waves.none = Ворагі не былі вызначаныя. \nЗвярнiце ўвагу, што пустыя хвалі будуць аўтаматычна замененыя звычайнай хваляй.
wavemode.counts = counts wavemode.counts = колькацсь адзінак
wavemode.totals = totals wavemode.totals = усяго здароўя
wavemode.health = health wavemode.health = здароўе
editor.default = [lightgray]<Па змаўчанні> editor.default = [lightgray]<Па змаўчанні>
details = Падрабязнасці... details = Падрабязнасці...
@@ -508,11 +508,11 @@ error.io = Сеткавая памылка ўводу-высновы.
error.any = Невядомая сеткавая памылка. error.any = Невядомая сеткавая памылка.
error.bloom = Не атрымалася ініцыялізаваць свячэнне (Bloom). \nМагчыма, зараз Вашая прылада не падтрымлівае яго. error.bloom = Не атрымалася ініцыялізаваць свячэнне (Bloom). \nМагчыма, зараз Вашая прылада не падтрымлівае яго.
weather.rain.name = Rain weather.rain.name = Дождж
weather.snow.name = Snow weather.snow.name = Снег
weather.sandstorm.name = Sandstorm weather.sandstorm.name = Пясочныя бурі
weather.sporestorm.name = Sporestorm weather.sporestorm.name = Споравыя бурі
weather.fog.name = Fog weather.fog.name = Туман
sectors.unexplored = [lightgray]Unexplored sectors.unexplored = [lightgray]Unexplored
sectors.resources = Resources: sectors.resources = Resources:
@@ -891,9 +891,9 @@ rules.enemyLights = Enemy Lights
rules.fire = Fire rules.fire = Fire
rules.explosions = Block/Unit Explosion Damage rules.explosions = Block/Unit Explosion Damage
rules.ambientlight = Навакольны свет rules.ambientlight = Навакольны свет
rules.weather = Weather rules.weather = Надвор'е
rules.weather.frequency = Frequency: rules.weather.frequency = Частата:
rules.weather.duration = Duration: rules.weather.duration = Працягласць:
content.item.name = Рэчывы content.item.name = Рэчывы
content.liquid.name = Вадкасці content.liquid.name = Вадкасці
@@ -922,62 +922,62 @@ liquid.oil.name = Нафта
liquid.cryofluid.name = Крыягенная вадкасць liquid.cryofluid.name = Крыягенная вадкасць
unit.dagger.name = Кінжал unit.dagger.name = Кінжал
unit.mace.name = Mace unit.mace.name = Булава
unit.fortress.name = Крэпасць unit.fortress.name = Крэпасць
unit.nova.name = Nova unit.nova.name = Нова
unit.pulsar.name = Pulsar unit.pulsar.name = Пульсар
unit.quasar.name = Quasar unit.quasar.name = Квазар
unit.crawler.name = Камікадзэ unit.crawler.name = Палзун
unit.atrax.name = Atrax unit.atrax.name = Атракс
unit.spiroct.name = Spiroct unit.spiroct.name = Спірокт
unit.arkyid.name = Arkyid unit.arkyid.name = Аркід
unit.toxopid.name = Toxopid unit.toxopid.name = Токсопойд
unit.flare.name = Flare unit.flare.name = Успышка
unit.horizon.name = Horizon unit.horizon.name = Гарызонт
unit.zenith.name = Zenith unit.zenith.name = Зеніт
unit.antumbra.name = Antumbra unit.antumbra.name = Зацемь
unit.eclipse.name = Eclipse unit.eclipse.name = Затменне
unit.mono.name = Mono unit.mono.name = Моно
unit.poly.name = Poly unit.poly.name = Полі
unit.mega.name = Mega unit.mega.name = Мега
unit.quad.name = Quad unit.quad.name = Квад
unit.oct.name = Oct unit.oct.name = Окт
unit.risso.name = Risso unit.risso.name = Ріссо
unit.minke.name = Minke unit.minke.name = Мінкі
unit.bryde.name = Bryde unit.bryde.name = Брайд
unit.sei.name = Sei unit.sei.name = Сэй
unit.omura.name = Omura unit.omura.name = Амура
unit.alpha.name = Alpha unit.alpha.name = Альфа
unit.beta.name = Beta unit.beta.name = Бэта
unit.gamma.name = Gamma unit.gamma.name = Гамма
unit.scepter.name = Scepter unit.scepter.name = Скіпетр
unit.reign.name = Reign unit.reign.name = Улада
unit.vela.name = Vela unit.vela.name = Ветразь
unit.corvus.name = Corvus unit.corvus.name = Корвус
block.resupply-point.name = Resupply Point block.resupply-point.name = Цэнтр аммуніцыі
block.parallax.name = Parallax block.parallax.name = Парралакс
block.cliff.name = Скала block.cliff.name = Скала
block.sand-boulder.name = Пяшчаны валун block.sand-boulder.name = Пяшчаны валун
block.grass.name = Трава block.grass.name = Трава
block.slag.name = Шлак block.slag.name = Шлак
block.space.name = Space block.space.name = Space
block.salt.name = Соль block.salt.name = Соль
block.salt-wall.name = Salt Wall block.salt-wall.name = Саляная сцяна
block.pebbles.name = Галька block.pebbles.name = Галька
block.tendrils.name = Споравыя вусікі block.tendrils.name = Споравыя вусікі
block.sand-wall.name = Sand Wall block.sand-wall.name = Пяшчаная сцяна
block.spore-pine.name = Спорава хвоя block.spore-pine.name = Спорава хвоя
block.spore-wall.name = Spore Wall block.spore-wall.name = Споравая сцяна
block.boulder.name = Boulder block.boulder.name = Boulder
block.snow-boulder.name = Snow Boulder block.snow-boulder.name = Снежны валун
block.snow-pine.name = Заснежаная хвоя block.snow-pine.name = Заснежаная хвоя
block.shale.name = Сланец block.shale.name = Сланец
block.shale-boulder.name = Сланцавы валун block.shale-boulder.name = Сланцавы валун
block.moss.name = Мох block.moss.name = Мох
block.shrubs.name = Кусты block.shrubs.name = Кусты
block.spore-moss.name = Спорава мох block.spore-moss.name = Спорава мох
block.shale-wall.name = Shale Wall block.shale-wall.name = Сланцавая сцяна
block.scrap-wall.name = Сцяна з металалому block.scrap-wall.name = Сцяна з металалому
block.scrap-wall-large.name = Вялікая сцяна з металалому block.scrap-wall-large.name = Вялікая сцяна з металалому
block.scrap-wall-huge.name = Велізарная сцяна з металалому block.scrap-wall-huge.name = Велізарная сцяна з металалому
@@ -1005,18 +1005,18 @@ block.craters.name = Кратэры
block.sand-water.name = Пясок з вадой block.sand-water.name = Пясок з вадой
block.darksand-water.name = Тёмный пясок з вадой block.darksand-water.name = Тёмный пясок з вадой
block.char.name = Выпаленая зямля block.char.name = Выпаленая зямля
block.dacite.name = Dacite block.dacite.name = Дацыт
block.dacite-wall.name = Dacite Wall block.dacite-wall.name = Дацытавая сцяна
block.dacite-boulder.name = Dacite Boulder block.dacite-boulder.name = Дацытавы валун
block.ice-snow.name = Заснежаны лёд block.ice-snow.name = Заснежаны лёд
block.stone-wall.name = Stone Wall block.stone-wall.name = Каменная сцяна
block.ice-wall.name = Ice Wall block.ice-wall.name = Лядовая сцяна
block.snow-wall.name = Snow Wall block.snow-wall.name = Снежная сцяна
block.dune-wall.name = Dune Wall block.dune-wall.name = Тёмнапясчаная сцяна
block.pine.name = Сасна block.pine.name = Сасна
block.dirt.name = Dirt block.dirt.name = Зямля
block.dirt-wall.name = Dirt Wall block.dirt-wall.name = Брудная сцяна
block.mud.name = Mud block.mud.name = Бруд
block.white-tree-dead.name = Мёртвае белае дрэва block.white-tree-dead.name = Мёртвае белае дрэва
block.white-tree.name = Белае дрэва block.white-tree.name = Белае дрэва
block.spore-cluster.name = Навала спрэчка block.spore-cluster.name = Навала спрэчка
@@ -1147,28 +1147,28 @@ block.container.name = Кантэйнер
block.launch-pad.name = Пускавая пляцоўка block.launch-pad.name = Пускавая пляцоўка
block.launch-pad-large.name = Вялікая пускавая пляцоўка block.launch-pad-large.name = Вялікая пускавая пляцоўка
block.segment.name = Segment block.segment.name = Segment
block.command-center.name = Command Center block.command-center.name = Каммандны цэнтр
block.ground-factory.name = Ground Factory block.ground-factory.name = Завод наземных адзінак
block.air-factory.name = Air Factory block.air-factory.name = Завод паветраных адзінак
block.naval-factory.name = Naval Factory block.naval-factory.name = Завод марскіх адзінак
block.additive-reconstructor.name = Additive Reconstructor block.additive-reconstructor.name = Злучальны рэканструктар
block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.multiplicative-reconstructor.name = Мультыплікацыйны рэканструктар
block.exponential-reconstructor.name = Exponential Reconstructor block.exponential-reconstructor.name = Экспаненцыяльны рэканструктар
block.tetrative-reconstructor.name = Tetrative Reconstructor block.tetrative-reconstructor.name = Тэтрацыйны рэканструктар
block.payload-conveyor.name = Mass Conveyor block.payload-conveyor.name = Канвеер для тяжёлай зброі
block.payload-router.name = Payload Router block.payload-router.name = Роутар для тяжёлай зброі
block.disassembler.name = Disassembler block.disassembler.name = Разборшчык
block.silicon-crucible.name = Silicon Crucible block.silicon-crucible.name = Крэмніевы тыгель
block.overdrive-dome.name = Overdrive Dome block.overdrive-dome.name = Сверхпрывадны купал
block.switch.name = Switch block.switch.name = Пераключальнік
block.micro-processor.name = Micro Processor block.micro-processor.name = Мікропрацэсар
block.logic-processor.name = Logic Processor block.logic-processor.name = Працэсар логікі
block.hyper-processor.name = Hyper Processor block.hyper-processor.name = Гіперпрацэсар
block.logic-display.name = Logic Display block.logic-display.name = Экран
block.large-logic-display.name = Large Logic Display block.large-logic-display.name = Вялікі экран
block.memory-cell.name = Memory Cell block.memory-cell.name = Ячэйка памяці
block.memory-bank.name = Memory Bank block.memory-bank.name = Банк памяці
team.blue.name = Сіняя team.blue.name = Сіняя
team.crux.name = Чырвоная team.crux.name = Чырвоная
@@ -1196,14 +1196,14 @@ tutorial.breaking = Часта, блокі даводзіцца руйнавац
tutorial.breaking.mobile = Часта, блокі даводзіцца руйнаваць. \n [accent] Вылучыце рэжым дэканструкцыі[], пасля чаго націсніце на патрэбны блок, каб разбурыць яго. \nРазрушьте блокі ў абранай зоне, трымаючы палец на некалькі секунд[], і правёўшы яго ў патрэбным кірунку. \nНажмите на галачку, каб пацвердзіць разбурэнне. \n \n [accent] разбурце усе сцены з металалому злева ад Вашага ядра. tutorial.breaking.mobile = Часта, блокі даводзіцца руйнаваць. \n [accent] Вылучыце рэжым дэканструкцыі[], пасля чаго націсніце на патрэбны блок, каб разбурыць яго. \nРазрушьте блокі ў абранай зоне, трымаючы палец на некалькі секунд[], і правёўшы яго ў патрэбным кірунку. \nНажмите на галачку, каб пацвердзіць разбурэнне. \n \n [accent] разбурце усе сцены з металалому злева ад Вашага ядра.
tutorial.withdraw = У некаторых сітуацыях, неабходна забраць прадметы з блокаў ўручную. \nКаб зрабіць гэта, [accent] націсніце на блок[], у якім знаходзяцца прадметы, затым [accent] націсніце на прадмет[] ў інвентары. \nМожно забраць некалькі прадметаў [accent] націскам з заціскам[].\n [accent] Забярыце трохі медзі з ядра[] tutorial.withdraw = У некаторых сітуацыях, неабходна забраць прадметы з блокаў ўручную. \nКаб зрабіць гэта, [accent] націсніце на блок[], у якім знаходзяцца прадметы, затым [accent] націсніце на прадмет[] ў інвентары. \nМожно забраць некалькі прадметаў [accent] націскам з заціскам[].\n [accent] Забярыце трохі медзі з ядра[]
tutorial.deposit = Пакладзеце прадметы ў блок, перацягнуўшы іх ад свайго карабля ў патрэбны блок. \n \n [accent] Перанясіце медзь назад у ядро [] tutorial.deposit = Пакладзеце прадметы ў блок, перацягнуўшы іх ад свайго карабля ў патрэбны блок. \n \n [accent] Перанясіце медзь назад у ядро []
tutorial.waves = [lightgray] Праціўнікі[] набліжаюцца. \nЗащитите ядро ​​ад двух хваль. Выкарыстоўвайце [accent] левую кнопку мышы[] для стральбы. \nПостройте больш турэляў і бураў. Добудьте больш медзі. tutorial.waves = [lightgray] Праціўнікі[] набліжаюцца. \nЗащіціце ядро ​​ад двух хваль. Выкарыстоўвайце [accent] левую кнопку мышы[] для стральбы. \nПостройте больш турэляў і бураў. Добудьте больш медзі.
tutorial.waves.mobile = [lightgray] Праціўнікі[] набліжаюцца. \n \nЗащитите ядро ​​ад двух хваль. Ваш карабель будзе аўтаматычна атакаваць праціўніка. \nПостройте больш турэляў і бураў. Добудьте больш медзі. tutorial.waves.mobile = [lightgray] Праціўнікі[] набліжаюцца. \n \nЗащіціце ядро ​​ад двух хваль. Ваш карабель будзе аўтаматычна атакаваць праціўніка. \nПостройте больш турэляў і бураў. Добудьте больш медзі.
tutorial.launch = Калі Вы дасягаеце пэўнай хвалі, Вы можаце ажыццявіць [accent] запуск ядра[], пакінуўшы базу і [accent] перанесці рэсурсы з ядра.[] \nЭти рэсурсы могуць быць выкарыстаны для вывучэння новых тэхналогій.\n [accent] Націсніце кнопку запуску. tutorial.launch = Калі Вы дасягаеце пэўнай хвалі, Вы можаце ажыццявіць [accent] запуск ядра[], пакінуўшы базу і [accent] перанесці рэсурсы з ядра.[] \nЭти рэсурсы могуць быць выкарыстаны для вывучэння новых тэхналогій.\n [accent] Націсніце кнопку запуску.
item.copper.description = Самы асноўны будаўнічы матэрыял. Шырока выкарыстоўваецца ва ўсіх тыпах блокаў. item.copper.description = Самы асноўны будаўнічы матэрыял. Шырока выкарыстоўваецца ва ўсіх тыпах блокаў.
item.lead.description = Асноўны стартавы матэрыял. Шырока выкарыстоўваецца ў электроніцы і блоках для транспарціроўкі вадкасцяў. item.lead.description = Асноўны стартавы матэрыял. Шырока выкарыстоўваецца ў электроніцы і блоках для транспарціроўкі вадкасцяў.
item.metaglass.description = звышмоцнага сплаў шкла. Шырока выкарыстоўваецца для размеркавання і захоўвання вадкасці. item.metaglass.description = Звышмоцны сплаў шкла. Шырока выкарыстоўваецца для размеркавання і захоўвання вадкасці.
item.graphite.description = мінералізаваныя вуглярод, які выкарыстоўваецца для боепрыпасаў і электрычных кампанентаў. item.graphite.description = Мінералізаваны вуглярод, які выкарыстоўваецца для боепрыпасаў і электрычных кампанентаў.
item.sand.description = Звычайны матэрыял, які шырока выкарыстоўваецца пры выплаўленні, як пры легіравання, так і ў якасці флюсу. item.sand.description = Звычайны матэрыял, які шырока выкарыстоўваецца пры выплаўленні, як пры легіравання, так і ў якасці флюсу.
item.coal.description = Закамянеласцевае мінеральнае рэчыва, якое ўтварылася задоўга да пасева. Шырока выкарыстоўваецца для вытворчасці паліва і рэсурсаў. item.coal.description = Закамянеласцевае мінеральнае рэчыва, якое ўтварылася задоўга да пасева. Шырока выкарыстоўваецца для вытворчасці паліва і рэсурсаў.
item.titanium.description = Рэдкі звышлёгкі метал, шырока выкарыстоўваецца для транспарціроўкі вадкасцяў, бураў і авіяцыі. item.titanium.description = Рэдкі звышлёгкі метал, шырока выкарыстоўваецца для транспарціроўкі вадкасцяў, бураў і авіяцыі.
@@ -1332,4 +1332,4 @@ block.cyclone.description = Вялікая турэль, якая можа ве
block.spectre.description = Масіўная двуствольное гармата. Страляе буйнымі бранябойнымі кулямі па паветраных і наземных мэтах. block.spectre.description = Масіўная двуствольное гармата. Страляе буйнымі бранябойнымі кулямі па паветраных і наземных мэтах.
block.meltdown.description = Масіўная лазерная гармата. Зараджае і страляе пастаянным лазерным прамянём ў бліжэйшых ворагаў. Патрабуецца астуджальная вадкасць для працы. block.meltdown.description = Масіўная лазерная гармата. Зараджае і страляе пастаянным лазерным прамянём ў бліжэйшых ворагаў. Патрабуецца астуджальная вадкасць для працы.
block.repair-point.description = Бесперапынна лечыць бліжэйшую пашкоджаную баявую адзінку або мех у сваім радыусе. block.repair-point.description = Бесперапынна лечыць бліжэйшую пашкоджаную баявую адзінку або мех у сваім радыусе.
block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. block.segment.description = Пашкоджвае і знішчае снарады. Лазерныя снарады не шкодзяца.

View File

@@ -10,7 +10,7 @@ link.dev-builds.description = Nestabilní vývojová verze hry
link.trello.description = Oficiální Trello nástěnka s plánovanými novinkami link.trello.description = Oficiální Trello nástěnka s plánovanými novinkami
link.itch.io.description = Stránka na itch.io s odkazy na stažení hry link.itch.io.description = Stránka na itch.io s odkazy na stažení hry
link.google-play.description = Obchod Google Play link.google-play.description = Obchod Google Play
link.f-droid.description = Katalog F-Droid link.f-droid.description = F-Droid
link.wiki.description = Oficiální Wiki Mindustry link.wiki.description = Oficiální Wiki Mindustry
link.suggestions.description = Suggest new features link.suggestions.description = Suggest new features
linkfail = Nepodařilo se otevřít odkaz!\nAdresa URL byla zkopírována do schránky. linkfail = Nepodařilo se otevřít odkaz!\nAdresa URL byla zkopírována do schránky.
@@ -20,8 +20,8 @@ gameover = Konec hry
gameover.pvp = Vyhrál tým [accent]{0}[]! gameover.pvp = Vyhrál tým [accent]{0}[]!
highscore = [accent]Nový rekord! highscore = [accent]Nový rekord!
copied = Zkopírováno. copied = Zkopírováno.
indev.popup = Mindustry [accent]v6[] je aktuálně ve verzi [accent]beta[].\n[lightgray]To znamená:[]\n[scarlet]- Kampaň je nedokončená[]\n- SFX a hudba je nedokončená nebo chybí\n- Cokoli, co vidíte, se může změnit nebo být odstraněno.\n\nHlaste prosím chyby na [accent]Github[].
indev.notready = Tato část hry ještě není připravena indev.notready = Tato část hry ještě není připravena
indev.campaign = [accent]Blahopřejeme! Završil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích.
load.sound = Zvuky load.sound = Zvuky
load.map = Mapy load.map = Mapy
@@ -57,6 +57,7 @@ schematic.rename = Přejmenovat šablonu
schematic.info = {0}x{1}, {2} bloků schematic.info = {0}x{1}, {2} bloků
schematic.disabled = [scarlet]Šablony jsou zakázány[]\nNa této [accent]mapě[] nebo [accent]serveru[] nemůžeš používat šablony. schematic.disabled = [scarlet]Šablony jsou zakázány[]\nNa této [accent]mapě[] nebo [accent]serveru[] nemůžeš používat šablony.
stats = Statistiky
stat.wave = Vln poraženo: [accent]{0} stat.wave = Vln poraženo: [accent]{0}
stat.enemiesDestroyed = Nepřátel zničeno: [accent]{0}[] stat.enemiesDestroyed = Nepřátel zničeno: [accent]{0}[]
stat.built = Budov postaveno: [accent]{0}[] stat.built = Budov postaveno: [accent]{0}[]
@@ -143,8 +144,12 @@ planetmap = Planetární mapa
launchcore = Vyslat jádro launchcore = Vyslat jádro
filename = Název souboru: filename = Název souboru:
unlocked = Byl odemmknut nový blok! unlocked = Byl odemmknut nový blok!
available = Je zpřístupněn nový výzkum!
completed = [accent]Dokončeno[] completed = [accent]Dokončeno[]
techtree = Technologie techtree = Technologie
research.legacy = Nalezena výzkumná data z verze [accent]5.0[].\nChceš [accent]tato data načíst[], nebo [accent]je zahodit[] a začít výzkum v nové kampani (což doporučujeme)?
research.load = Načíst
research.discard = Zahodit
research.list = [lightgray]Výzkum:[] research.list = [lightgray]Výzkum:[]
research = Výzkum research = Výzkum
researched = Dokončen výzkum technologie: [lightgray]{0}[]. researched = Dokončen výzkum technologie: [lightgray]{0}[].
@@ -189,6 +194,11 @@ servers.local = Místní servery
servers.remote = Vzdálené servery servers.remote = Vzdálené servery
servers.global = Komunitní servery servers.global = Komunitní servery
servers.disclaimer = Komunitní servery [accent]nejsou[] vlastněny ani kontrolovány vývojářem této hry.\n\nServery mohou obsahovat obsah vytvořený uživateli, který může na některé uživatele působit nepatřičně či nevhodně.
servers.showhidden = Zobraz skryté servery
server.shown = Zobrazené
server.hidden = Skryté
trace = Vystopovat hráče trace = Vystopovat hráče
trace.playername = Jméno hráče: [accent]{0}[] trace.playername = Jméno hráče: [accent]{0}[]
trace.ip = Adresa IP: [accent]{0}[] trace.ip = Adresa IP: [accent]{0}[]
@@ -222,6 +232,7 @@ disconnect.timeout = Vypršel čas pro připojení.
disconnect.data = Chyba načtení dat ze serveru! disconnect.data = Chyba načtení dat ze serveru!
cantconnect = Není možno se připojit ke hře ([accent]{0}[]). cantconnect = Není možno se připojit ke hře ([accent]{0}[]).
connecting = [accent]Připojuji se...[] connecting = [accent]Připojuji se...[]
reconnecting = [accent]Znovu se připojuji...
connecting.data = [accent]Načítám data ze serveru...[] connecting.data = [accent]Načítám data ze serveru...[]
server.port = Port: server.port = Port:
server.addressinuse = Adresu již někdo používá! server.addressinuse = Adresu již někdo používá!
@@ -267,6 +278,9 @@ cancel = Zrušit
openlink = Otevřít odkaz openlink = Otevřít odkaz
copylink = Zkopírovat odkaz copylink = Zkopírovat odkaz
back = Zpět back = Zpět
crash.export = Exportovat záznamy o zhroucení hry
crash.none = Záznamy o zhroucení hry nebyly nalezeny.
crash.exported = Záznamy o zhroucení hry byly exportovány.
data.export = Exportovat data data.export = Exportovat data
data.import = Importovat data data.import = Importovat data
data.openfolder = Otevřít složku s daty data.openfolder = Otevřít složku s daty
@@ -283,6 +297,7 @@ cancelbuilding = [accent][[{0}][] vyčistí plán šablony
selectschematic = [accent][[{0}][] provede výběr a zkopírování selectschematic = [accent][[{0}][] provede výběr a zkopírování
pausebuilding = [accent][[{0}][] zastaví stavění pausebuilding = [accent][[{0}][] zastaví stavění
resumebuilding = [scarlet][[{0}][] bude pokračovat ve stavění resumebuilding = [scarlet][[{0}][] bude pokračovat ve stavění
showui = UI je skryto.\nZmáčkni [accent][[{0}][] pro jeho zobrazení.
wave = [accent]Vlna číslo {0}[] wave = [accent]Vlna číslo {0}[]
wave.cap = [accent]Vlna {0} z {1}[] wave.cap = [accent]Vlna {0} z {1}[]
wave.waiting = [lightgray]Vlna za {0} vteřin[] wave.waiting = [lightgray]Vlna za {0} vteřin[]
@@ -290,7 +305,9 @@ wave.waveInProgress = [lightgray]Vlna přichází![]
waiting = [lightgray]Čekám...[] waiting = [lightgray]Čekám...[]
waiting.players = Čekání na hráče... waiting.players = Čekání na hráče...
wave.enemies = [lightgray]{0} zbývajících nepřátel wave.enemies = [lightgray]{0} zbývajících nepřátel
wave.enemy = [lightgray]{0} zbývající nepřítel wave.enemycores = [accent]{0}[lightgray] nepřátelská jádra
wave.enemycore = [accent]{0}[lightgray] nepřátelské jádro
wave.enemy = [lightgray]{0} zbývající nepřátel
wave.guardianwarn = Počet vln do příchodu strážce: [accent]{0}[]. wave.guardianwarn = Počet vln do příchodu strážce: [accent]{0}[].
wave.guardianwarn.one = [accent]Strážce přijde již příští vlnu![] wave.guardianwarn.one = [accent]Strážce přijde již příští vlnu![]
loadimage = Nahrát obrázek loadimage = Nahrát obrázek
@@ -420,7 +437,7 @@ toolmode.drawteams.description = Kreslí týmy místo bloků.
filters.empty = [lightgray]Nejsou zadány žádné filtry, přidej filtr tlačítkem níže.[] filters.empty = [lightgray]Nejsou zadány žádné filtry, přidej filtr tlačítkem níže.[]
filter.distort = Zkreslení filter.distort = Zkreslení
filter.noise = Zašumění filter.noise = Zašumění
filter.enemyspawn = Výběr nepřítelské líhně filter.enemyspawn = Výběr nepřátelské líhně
filter.spawnpath = Cesta k líhni filter.spawnpath = Cesta k líhni
filter.corespawn = Váběr ládra filter.corespawn = Váběr ládra
filter.median = Medián filter.median = Medián
@@ -463,7 +480,9 @@ load = Načíst
save = Uložit save = Uložit
fps = FPS: {0} fps = FPS: {0}
ping = Odezva: {0} ms ping = Odezva: {0} ms
language.restart = Prosím restartuj hru, aby se provedla změna jazyka! memory = Paměť: {0} MB
memory2 = Paměť:\n {0} MB +\n {1} MB
language.restart = Hru je třeba restartovat, aby se provedla změna jazyka.
settings = Volby settings = Volby
tutorial = Výuka tutorial = Výuka
tutorial.retake = Spustit znovu výuku. tutorial.retake = Spustit znovu výuku.
@@ -476,26 +495,22 @@ locked = Zamčeno
complete = [lightgray]Dokončeno: complete = [lightgray]Dokončeno:
requirement.wave = Dosáhni vlny {0} na mapě {1} requirement.wave = Dosáhni vlny {0} na mapě {1}
requirement.core = Znič nepřátelské jádro na mapě {0} requirement.core = Znič nepřátelské jádro na mapě {0}
requirement.research = Vynalezeno {0} requirement.research = Vynalezni {0}
requirement.capture = Polapeno {0} requirement.produce = Vyrob {0}
bestwave = [lightgray]Nejvyšší vlna: {0} requirement.capture = Polap {0}
launch.text = Vyslat launch.text = Vyslat
research.multiplayer = Jen hostitel hry může vynalézat nové technologie. research.multiplayer = Jen hostitel hry může vynalézat nové technologie.
map.multiplayer = Jen hostitel může prohlížet sektory.
uncover = Odkrýt mapu uncover = Odkrýt mapu
configure = Přizpůsobit vybavení configure = Přizpůsobit vybavení
#TODO
loadout = Načtení loadout = Načtení
resources = Zdroje resources = Zdroje
bannedblocks = Zakázané bloky bannedblocks = Zakázané bloky
addall = Přidat vše addall = Přidat vše
launch.from = Vysláno z: [accent]{0}
launch.destination = Cíl: {0} launch.destination = Cíl: {0}
configure.invalid = Hodnota musí být číslo mezi 0 a {0}. configure.invalid = Hodnota musí být číslo mezi 0 a {0}.
zone.unlocked = [lightgray]Mapa {0} byla odemknuta.[]
zone.requirement.complete = Bylo dosaženo vlny {0},\nčímž byla splněna podmínka pro mapu {1}.
zone.resources = [lightgray]Byly detekovány tyto suroviny:[]
zone.objective = [lightgray]Úkol: [][accent]{0}[]
zone.objective.survival = Přežij
zone.objective.attack = Znič nepřátelské jádro
add = Přidat... add = Přidat...
boss.health = Životy Strážce boss.health = Životy Strážce
@@ -519,19 +534,41 @@ weather.fog.name = Mlha
sectors.unexplored = [lightgray]Neprozkoumáno sectors.unexplored = [lightgray]Neprozkoumáno
sectors.resources = Zdroje: sectors.resources = Zdroje:
sectors.production = Výroba: sectors.production = Výroba:
sectors.export = Export:
sectors.time = Čas:
sectors.threat = Ohrožení:
sectors.wave = Vlna:
sectors.stored = Uskladněno: sectors.stored = Uskladněno:
sectors.resume = Pokračovat sectors.resume = Pokračovat
sectors.launch = Vyslat sectors.launch = Vyslat
sectors.select = Vybrat sectors.select = Vybrat
sectors.nonelaunch = [lightgray]bez (slunce)[] sectors.nonelaunch = [lightgray]bez (slunce)[]
sectors.rename = Přejmenovat sektor sectors.rename = Přejmenovat sektor
sector.missingresources = [scarlet]Nedostatečné zdroje v jádře[] sectors.enemybase = [scarlet]Nepřátelská základna
sectors.vulnerable = [scarlet]Zranitelný
sectors.underattack = [scarlet]Pod palbou! [accent]{0}% poškozeno
sectors.survives = [accent]Přežívá již {0} vln
sectors.go = Jdi
sector.curcapture = Sektor polapen
sector.curlost = Sektor ztracen
sector.missingresources = [scarlet]Nedostatečné zdroje v jádře
sector.attacked = Sektor [accent]{0}[white] pod útokem!
sector.lost = Sektor [accent]{0}[white] ztracen! :(
#note: chybějící mezera v řádce níže je záměrná :)
sector.captured = Sektor [accent]{0}[white]polapen! :)
threat.low = Nízké
threat.medium = Střední
threat.high = Velké
threat.extreme = Extrémní
threat.eradication = Vyhlazující
planets = Planets
planet.serpulo.name = Serpulo planet.serpulo.name = Serpulo
#TODO better name
planet.sun.name = Sol planet.sun.name = Sol
#NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway sector.impact0078.name = Dopad 0078
sector.groundZero.name = Základní tábor sector.groundZero.name = Základní tábor
sector.craters.name = Krátery sector.craters.name = Krátery
sector.frozenForest.name = Zamrzlý les sector.frozenForest.name = Zamrzlý les
@@ -543,22 +580,27 @@ sector.overgrowth.name = Džungle
sector.tarFields.name = Dehtová pole sector.tarFields.name = Dehtová pole
sector.saltFlats.name = Solné nížiny sector.saltFlats.name = Solné nížiny
sector.fungalPass.name = Plísňový průsmyk sector.fungalPass.name = Plísňový průsmyk
sector.biomassFacility.name = Zařízení pro syntézu biomasy
#unused sector.windsweptIslands.name = Větrné ostrovy
#sector.impact0078.name = Impact 0078 sector.extractionOutpost.name = Extrakční základna
#sector.crags.name = Crags sector.planetaryTerminal.name = Planetární odpalovací terminál
sector.groundZero.description = Optimální místo, kde znovu začít. Nízký výskyt nepřátel. Několik málo surovin.\nPosbírej co nejvíce olova a mědi.\nBěž dál. sector.groundZero.description = Optimální místo, kde znovu začít. Nízký výskyt nepřátel. Několik málo surovin.\nPosbírej co nejvíce olova a mědi.\nBěž dál.
sector.frozenForest.description = Dokonce až sem, blízko hor, se dokázaly spóry rozrůst. Mráz je však nemůže zadržet navěky.\n\nPusť se do práce za pomocí energie. Stav spalovací generátory. Nauč se, jak používat opravovací věže. sector.frozenForest.description = Dokonce až sem, blízko hor, se dokázaly spóry rozrůst. Mráz je však nemůže zadržet navěky.\n\nPusť se do práce za pomocí energie. Stav spalovací generátory. Nauč se, jak používat opravovací věže.
sector.saltFlats.description = Na okraji pouště leží Solné nížiny. V této lokaci se nachází jen několik málo surovin.\n\nNepřítel zde vybudoval zásobovací komplex. Znič jádro v jeho základně. Nenechej kámen na kameni. sector.saltFlats.description = Na okraji pouště leží Solné nížiny. V této lokaci se nachází jen několik málo surovin.\n\nNepřítel zde vybudoval zásobovací komplex. Znič jádro v jeho základně. Nenechej kámen na kameni.
sector.craters.description = V těchto relikviích starých válek se nahromadilo velké množství vody. Znovu získej tuto oblast. Sbírej písek. Vyrob z něj metasklo. Použij vodu k chlazení svých vrtů a střílen. sector.craters.description = V těchto relikviích starých válek se nahromadilo velké množství vody. Znovu získej tuto oblast. Sbírej písek. Vyrob z něj metasklo. Použij vodu k chlazení svých vrtů a střílen.
sector.ruinousShores.description = Za pustinou se nachází pobřeží. Kdysi zde stál obranný pobřežní systém. Moc z něj už dneska nezbylo. Jen základní stavby zůstaly ušetřeny, zbytek se rozpadl na šrot.\nPokračuj ve své expanzi hlouběji. Objev ztracenou technologii. sector.ruinousShores.description = Za pustinou se nachází pobřeží. Kdysi zde stál obranný pobřežní systém. Moc z něj už dneska nezbylo. Jen základní konstrukce zůstaly ušetřeny, zbytek se rozpadl na šrot.\nPokračuj ve své expanzi hlouběji. Objev ztracenou technologii.
sector.stainedMountains.description = Dále ve vnitrozemí leží hory, dosud neposkvrněny spórami.\nVytěž titan, kterým tato oblast oplývá. Nauč se jej používat.\n\nPřítomnost nepřátelských jednotek je zde větší. Radši jim nedej moc času na vyslání jejich nejsilnějších jednotech. sector.stainedMountains.description = Dále ve vnitrozemí leží hory, dosud neposkvrněny spórami.\nVytěž titan, kterým tato oblast oplývá. Nauč se jej používat.\n\nPřítomnost nepřátelských jednotek je zde větší. Radši jim nedej moc času na vyslání jejich nejsilnějších jednotech.
sector.overgrowth.description = Tato přerostlá džungle se nachází blíže ke zdroji spór.\nNepřítel zde zbudoval předsunutou hlídku. Stav jednotky Dýka a znič s jejich pomocí jádro základny. Získej znovu to, co bylo již dávno ztraceno. sector.overgrowth.description = Tato přerostlá džungle se nachází blíže ke zdroji spór.\nNepřítel zde zbudoval předsunutou hlídku. Stav jednotky Palcát a znič s jejich pomocí jádro základny.
sector.tarFields.description = Rozhraní produkční naftové oblasti mezi horami a pouští. Jedna z mála oblastí, kde se stále nachází dehet.\nAčkoliv je oblast opuštěná, stále se v jejím okolí nachází nebezpečné nepřátelské síly. Není radno je podcenit.\n\n[lightgray]Vyzkoumej technologii na zpracování nafty.[] sector.tarFields.description = Rozhraní produkční naftové oblasti mezi horami a pouští. Jedna z mála oblastí, kde se stále nachází dehet.\nAčkoliv je oblast opuštěná, stále se v jejím okolí nachází nebezpečné nepřátelské síly. Není radno je podcenit.\n\n[lightgray]Vyzkoumej technologii na zpracování nafty.[]
sector.desolateRift.description = Extrémně nebezpečná mapa. Na úkor prostoru se zde nachází přehršel surovin. Vysoká pravděpodobnost zničení. Opusť tuto oblast co nejdříve to půjde. Nenech se zmást dlouhými prodlevami mezi vlnami nepřátel. sector.desolateRift.description = Extrémně nebezpečná mapa. Na úkor prostoru se zde nachází přehršel surovin. Vysoká pravděpodobnost zničení. Opusť tuto oblast co nejdříve to půjde. Nenech se zmást dlouhými prodlevami mezi vlnami nepřátel.
sector.nuclearComplex.description = Bývalá továrna na zpracování thoria, dnes v troskách.\n[lightgray]Objev thorium a jeho široké využití.[]\n\nNepřátelské jednotky se zde nacházejí v hojném počtu, a neustále prohledávají oblast. sector.nuclearComplex.description = Bývalá továrna na zpracování thoria, dnes v troskách.\n[lightgray]Objev thorium a jeho široké využití.[]\n\nNepřátelské jednotky se zde nacházejí v hojném počtu, a neustále prohledávají oblast.
sector.fungalPass.description = Přechodová oblast mezi vysokými horami a spórami nasycenou zemí. Nachází se zde malá průzkumná základna Tvého nepřítele.\nZnič ji.\nPoužij mechy Dýka a Slídil. Znič obě nepřátelské jádra. sector.fungalPass.description = Přechodová oblast mezi vysokými horami a spórami nasycenou zemí. Nachází se zde malá průzkumná základna Tvého nepřítele.\nZnič ji.\nPoužij mechy Dýka a Slídil. Znič obě nepřátelské jádra.
sector.biomassFacility.description = Prapůvod všech spór. Toto je zařízení, be kterém byly spóry vynalezeny a zpočátku u vyráběny.\nVynalezni technologii, která se skrýbá uvnitř. Kultivuj spóry k výrobě paliva a plastů.\n\n[lightgray]Po vypnutí tohoto zařízení byly spóry vypuštěny. V okolním ekosystému však tomuto invazivnímu druhu nebylo nic schopné konkurovat.
sector.windsweptIslands.description = Vzdálen od pevniny je tento řetízek ostrovů. Záznamy ukazují, že zde kdysi byly zařízení na výrobu [accent]Plastany[].\n\nPoraž nepřátelské námořní jednotky. Vybuduj základnu na ostrově. Vynalezni továrny.
sector.extractionOutpost.description = Vzdálená pevnost, postavená nepřítelem za účelem vysílání zdrojů do okolních sektorů.\n\nDoprava položek napříč sektory je nezbytná pro lapení dalších sektorů. Znič základnu. Vyzkoumej jejich Vysílací plošiny.
sector.impact0078.description = Zde leží zbytky mezihvězdné lodi, která vstoupila d otohoto systému.\n\nZachraň z vraku vše, co se dá. Vyzkoumej nepoškozenou technologii.
sector.planetaryTerminal.description = Konečný cíl.\n\nTato pobřežní základna obsahuje konstrukce schopné vyslat jádra na okolní planety. Je mimořádně dobře opevněna.\n\nVyrob námořní jednotky. Odstraň nepřítele tak rychle, jak umíš. Vyzkoumej vysílací konstrukci.
settings.language = Jazyk settings.language = Jazyk
settings.data = Data hry settings.data = Data hry
@@ -590,6 +632,7 @@ unit.nobuild = [scarlet]Jednotka nemůže stavět
lastaccessed = [lightgray]Naposledy použil: {0} lastaccessed = [lightgray]Naposledy použil: {0}
block.unknown = [lightgray]???[] block.unknown = [lightgray]???[]
stat.description = Účel
stat.input = Vstup stat.input = Vstup
stat.output = Výstup stat.output = Výstup
stat.booster = Posilovač stat.booster = Posilovač
@@ -617,6 +660,8 @@ stat.memorycapacity = Kapacita paměti
stat.basepowergeneration = Základní generování energie stat.basepowergeneration = Základní generování energie
stat.productiontime = Čas produkce stat.productiontime = Čas produkce
stat.repairtime = Čas do úplné opravy stat.repairtime = Čas do úplné opravy
stat.weapons = Zbraně
stat.bullet = Střela
stat.speedincrease = Zvýšení rychlosti stat.speedincrease = Zvýšení rychlosti
stat.range = Dosah stat.range = Dosah
stat.drilltier = Lze těžit stat.drilltier = Lze těžit
@@ -624,9 +669,9 @@ stat.drillspeed = Základní rychlost vrtu
stat.boosteffect = Účinek posílení stat.boosteffect = Účinek posílení
stat.maxunits = Nejvýše aktivních jednotek stat.maxunits = Nejvýše aktivních jednotek
stat.health = Životy stat.health = Životy
stat.buildtime = Čas stavby stat.buildtime = Čas konstrukce
stat.maxconsecutive = Nejvýše po sobě stat.maxconsecutive = Nejvýše po sobě
stat.buildcost = Cena stavby stat.buildcost = Cena konstrukce
stat.inaccuracy = Nepřesnost stat.inaccuracy = Nepřesnost
stat.shots = Střely stat.shots = Střely
stat.reload = Střel za 1s stat.reload = Střel za 1s
@@ -657,6 +702,7 @@ ability.repairfield = Opravit pole
ability.statusfield = Stav pole ability.statusfield = Stav pole
ability.unitspawn = {0} továrna ability.unitspawn = {0} továrna
ability.shieldregenfield = Silově opravné pole ability.shieldregenfield = Silově opravné pole
ability.movelightning = Pohybující se blesk
bar.drilltierreq = Je vyžadován lepší vrt bar.drilltierreq = Je vyžadován lepší vrt
bar.noresources = Chybějí zdroje bar.noresources = Chybějí zdroje
@@ -676,7 +722,7 @@ bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[jednotka je v
bar.liquid = Chlazení bar.liquid = Chlazení
bar.heat = Teplo bar.heat = Teplo
bar.power = Energie bar.power = Energie
bar.progress = Stavba v průběhu bar.progress = Konstrukce v průběhu
bar.input = Vstup bar.input = Vstup
bar.output = Výstup bar.output = Výstup
@@ -684,13 +730,15 @@ units.processorcontrol = [lightgray]Procesor je ovládán[]
bullet.damage = [stat]{0}[lightgray] poškození[] bullet.damage = [stat]{0}[lightgray] poškození[]
bullet.splashdamage = [stat]{0}[lightgray] plošného poškození ~[stat] {1}[lightgray] dlaždic bullet.splashdamage = [stat]{0}[lightgray] plošného poškození ~[stat] {1}[lightgray] dlaždic
bullet.incendiary = [stat]zápalné bullet.incendiary = [stat]zápalný
bullet.sapping = [stat]oslabující
bullet.homing = [stat]samonaváděcí bullet.homing = [stat]samonaváděcí
bullet.shock = [stat]šokové bullet.shock = [stat]šokový
bullet.frag = [stat]trhavé bullet.frag = [stat]trhavý
bullet.knockback = [stat]{0}[lightgray] odhození[] bullet.knockback = [stat]{0}[lightgray] odhození[]
bullet.pierce = [stat]{0}[lightgray]x průrazné[] bullet.pierce = [stat]{0}[lightgray]x průrazné[]
bullet.infinitepierce = [stat]průrazné[] bullet.infinitepierce = [stat]průrazné[]
bullet.healpercent = [stat]{0}[lightgray]% opravující
bullet.freezing = [stat]zmrazující[] bullet.freezing = [stat]zmrazující[]
bullet.tarred = [stat]dehtující[] bullet.tarred = [stat]dehtující[]
bullet.multiplier = [stat]{0}[lightgray]x více střel[] bullet.multiplier = [stat]{0}[lightgray]x více střel[]
@@ -715,6 +763,7 @@ unit.items = předměty
unit.thousands = tis unit.thousands = tis
unit.millions = mio unit.millions = mio
unit.billions = mld unit.billions = mld
category.purpose = Účel
category.general = Všeobecné category.general = Všeobecné
category.power = Energie category.power = Energie
category.liquids = Kapaliny category.liquids = Kapaliny
@@ -728,7 +777,7 @@ setting.blockreplace.name = Automatický návrh bloků
setting.linear.name = Lineární filtrování setting.linear.name = Lineární filtrování
setting.hints.name = Rady a tipy setting.hints.name = Rady a tipy
setting.flow.name = Zobrazit rychlost toku zdroje [scarlet](experimentální)[] setting.flow.name = Zobrazit rychlost toku zdroje [scarlet](experimentální)[]
setting.backgroundpause.name = Pozastavit na pozadí setting.backgroundpause.name = Pozastavit v pozadí
setting.buildautopause.name = Automaticky pozastavit stavění setting.buildautopause.name = Automaticky pozastavit stavění
setting.animatedwater.name = Animované povrchy setting.animatedwater.name = Animované povrchy
setting.animatedshields.name = Animované štíty setting.animatedshields.name = Animované štíty
@@ -757,16 +806,15 @@ setting.conveyorpathfinding.name = Hledat cestu při umisťování pásu
setting.sensitivity.name = Citlivost ovladače setting.sensitivity.name = Citlivost ovladače
setting.saveinterval.name = Interval automatického ukládání setting.saveinterval.name = Interval automatického ukládání
setting.seconds = {0} sekund setting.seconds = {0} sekund
setting.blockselecttimeout.name = Časový limit pro výběr bloku
setting.milliseconds = {0} milisekund setting.milliseconds = {0} milisekund
setting.fullscreen.name = Celá obrazovka setting.fullscreen.name = Celá obrazovka
setting.borderlesswindow.name = Bezokrajové okno[lightgray] (může výt vyžadován restart)[] setting.borderlesswindow.name = Bezokrajové okno [lightgray](může výt vyžadován restart)
setting.fps.name = Ukázat FPS a ping setting.fps.name = Ukázat FPS a ping
setting.smoothcamera.name = Plynulá kamera setting.smoothcamera.name = Plynulá kamera
setting.vsync.name = Vertikální synchronizace setting.vsync.name = Vertikální synchronizace
setting.pixelate.name = Rozpixlovat setting.pixelate.name = Rozpixlovat
setting.minimap.name = Ukázat mapičku setting.minimap.name = Ukázat mapičku
setting.coreitems.name = Ukázat položky jádra (WIP) setting.coreitems.name = Ukázat položky jádra
setting.position.name = Ukázat pozici hráče setting.position.name = Ukázat pozici hráče
setting.musicvol.name = Hlasitost hudby setting.musicvol.name = Hlasitost hudby
setting.atmosphere.name = Ukázat atmosféru planety setting.atmosphere.name = Ukázat atmosféru planety
@@ -846,6 +894,8 @@ keybind.menu.name = Hlavní nabídka
keybind.pause.name = Pozastavení hry keybind.pause.name = Pozastavení hry
keybind.pause_building.name = Pozastavit nebo spustit stavění keybind.pause_building.name = Pozastavit nebo spustit stavění
keybind.minimap.name = Mapička keybind.minimap.name = Mapička
keybind.planet_map.name = Planetární mapa
keybind.research.name = Výzkum
keybind.chat.name = Kanál zpráv keybind.chat.name = Kanál zpráv
keybind.player_list.name = Seznam hráčů keybind.player_list.name = Seznam hráčů
keybind.console.name = Terminál keybind.console.name = Terminál
@@ -859,7 +909,7 @@ keybind.drop_unit.name = Zahodit jednotku
keybind.zoom_minimap.name = Přiblížit mapu keybind.zoom_minimap.name = Přiblížit mapu
mode.help.title = Popis režimů mode.help.title = Popis režimů
mode.survival.name = Hra o přežití mode.survival.name = Hra o přežití
mode.survival.description = Klasický režim. Zdroje jsou limitované a vlny nepřátel přicházejí automaticky.\n[gray]Vyžaduje, aby v mapě bylo místo pro líhnutí nepřítel.[] mode.survival.description = Klasický režim. Zdroje jsou limitované a vlny nepřátel přicházejí automaticky.\n[gray]Vyžaduje, aby v mapě bylo místo pro líhnutí nepřátel.[]
mode.sandbox.name = Pískoviště mode.sandbox.name = Pískoviště
mode.sandbox.description = Zdroje jsou nekonečné, vlny nepřátel nemají automatické načasování. mode.sandbox.description = Zdroje jsou nekonečné, vlny nepřátel nemají automatické načasování.
mode.editor.name = Editor mode.editor.name = Editor
@@ -909,6 +959,7 @@ content.item.name = Předměty
content.liquid.name = Kapaliny content.liquid.name = Kapaliny
content.unit.name = Jednotky content.unit.name = Jednotky
content.block.name = Bloky content.block.name = Bloky
content.sector.name = Sektory
item.copper.name = Měď item.copper.name = Měď
item.lead.name = Olovo item.lead.name = Olovo
@@ -927,7 +978,7 @@ item.pyratite.name = Pyratit
item.metaglass.name = Metasklo item.metaglass.name = Metasklo
item.scrap.name = Šrot item.scrap.name = Šrot
liquid.water.name = Voda liquid.water.name = Voda
liquid.slag.name = Roztavený kov liquid.slag.name = Struska
liquid.oil.name = Nafta liquid.oil.name = Nafta
liquid.cryofluid.name = Chladící kapalina liquid.cryofluid.name = Chladící kapalina
@@ -969,8 +1020,9 @@ block.resupply-point.name = Zásobovací místo
block.parallax.name = Paralaxa block.parallax.name = Paralaxa
block.cliff.name = Útes block.cliff.name = Útes
block.sand-boulder.name = Pískovec block.sand-boulder.name = Pískovec
block.basalt-boulder.name = Čedičový balvan
block.grass.name = Tráva block.grass.name = Tráva
block.slag.name = Slag block.slag.name = Struska
block.space.name = Vesmír block.space.name = Vesmír
block.salt.name = Sůl block.salt.name = Sůl
block.salt-wall.name = Solné skály block.salt-wall.name = Solné skály
@@ -1066,7 +1118,6 @@ block.conveyor.name = Dopravník
block.titanium-conveyor.name = Titanoový dopravník block.titanium-conveyor.name = Titanoový dopravník
block.plastanium-conveyor.name = Plastanový přepravník block.plastanium-conveyor.name = Plastanový přepravník
block.armored-conveyor.name = Obrněný dopravník block.armored-conveyor.name = Obrněný dopravník
block.armored-conveyor.description = Přepravuje předměty stejně rychle jako titanový přepravník, ale má navíc brnění. Přijímá předměty ze srtan pouze z jiných přepravníků.
block.junction.name = Křižovatka block.junction.name = Křižovatka
block.router.name = Směrovač block.router.name = Směrovač
block.distributor.name = Rozdělovač block.distributor.name = Rozdělovač
@@ -1148,7 +1199,7 @@ block.fuse.name = Fúze
block.shock-mine.name = Šoková mina block.shock-mine.name = Šoková mina
block.overdrive-projector.name = Urychlující projektor block.overdrive-projector.name = Urychlující projektor
block.force-projector.name = Silový projektor block.force-projector.name = Silový projektor
block.arc.name = Oblouk block.arc.name = Výboj
block.rtg-generator.name = RTG block.rtg-generator.name = RTG
block.spectre.name = Přízrak block.spectre.name = Přízrak
block.meltdown.name = Rozpékač block.meltdown.name = Rozpékač
@@ -1170,6 +1221,11 @@ block.payload-router.name = Směřovač nákladu
block.disassembler.name = Rozebírač block.disassembler.name = Rozebírač
block.silicon-crucible.name = Tavicí tyglík pro křemík block.silicon-crucible.name = Tavicí tyglík pro křemík
block.overdrive-dome.name = Velká urychlující kupole block.overdrive-dome.name = Velká urychlující kupole
#experimental, may be removed
block.block-forge.name = Výheň bloků
block.block-loader.name = Nakladač bloků
block.block-unloader.name = Vykladač bloků
block.interplanetary-accelerator.name = Meziplanetární urychlovač
block.switch.name = Přepínač block.switch.name = Přepínač
block.micro-processor.name = Mikroprocesor block.micro-processor.name = Mikroprocesor
@@ -1188,158 +1244,247 @@ team.derelict.name = opuštěný
team.green.name = zelený team.green.name = zelený
team.purple.name = fialový team.purple.name = fialový
tutorial.next = [lightgray]<Klikni pro pokračování> hint.skip = Přeskočit
tutorial.intro = Vítej ve [scarlet]výuce Mindustry[]. Zde se dozvíš základy hraní.\nPoznámka: výuka předpokládá [accent]výchozí klávesy[] v nastavení, pokud jsi je změnil, bude třeba to vzít v potaz.\nPoužij [accent][[WASD][] pro pohyb a [accent]kolečko myši[] pro přibližování a oddalování.\nZačni [accent]těžením mědi[]. Přibliž se k měděné žíle u Tvého jádra a klikni na ni pro zahájení těžby.\n\n[accent]{0}/{1} mědi[] hint.desktopMove = Použij [accent][[WASD][] k pohybu.
tutorial.intro.mobile = Vítej ve [scarlet]výuce Mindustry[].\nPohybuj se táhnutím prstem do strany.\nPřibližuj a oddaluj mapu [accent]2 prsty[].\nZačni [accent] těžením mědi[]. Přibliž se k měděné žíle u Tvého jádra a ťupni na ni pro zahájení těžby.\n\n[accent]{0}/{1} mědi[] hint.zoom = [accent]Roluj[] prp přiblížení a oddalování obrazvky.
tutorial.drill = Sám vidíš, že ruční těžba není moc efektivní.\n[accent]Vrty[] umožňují těžit automaticky.\nKlikni na vrt v nabídce v pravém dolním rohu.\nVyber [accent]mechanický vrt[]. Umisti jej kliknutím na měděnou žílu.\nTaké můžeš vybrat mechanický vrt stiskem kláves [accent][[2][] a následně [accent][[1][] rychle po sobě, nezávisle na tom, jaká záložka je v nabídce zrovna otevřena.\n[accent]Pravým klikem[] přerušíš stavění. hint.mine = Přesuň se poblíž \uf8c4 měděné rudy a [accent]ťupni[] na ni pro zahájení těžby.
tutorial.drill.mobile = Sám vidíš, že ruční těžba není moc efektivní.\n[accent]Vrty[] umožňují těžit automaticky.\nŤupni na vrt v nabídce v pravém dolním rohu.\nVyber [accent]mechanický vrt[]. Umisti jej klikutím na měděnou žílu ťupnutím a následně zaškrtni [accent]fajfku[] na spodku nabídky pro potvrzení volby.\nŤupnutím na [accent]X[] přerušíš stavění. hint.desktopShoot = Klikni na [accent][[levé tlačítko][] myši pro střelbu.
tutorial.blockinfo = Každý blok má jiné vlastnosti. Každý vrt může těžit pouze některé suroviny.\nPro zobrazení informací a statistik o bloku [accent]zvol "?" při vybraném bloku ve stavební nabídce[].\n\nNyní se podívej na [accent]vlastnosti mechanického vrtu[]. hint.depositItems = Pro přesun položek je přetáhni ze své lodi do jádra.
tutorial.conveyor = Pro dopravu materiálu k jádru jsou zapotřebí [accent]dopravníky[].\nVytvoř řadu dopravníků od vrtu až k jádru.\nDrž zmáčknuté [accent]levé tlačítko myši[], abys umístil dopravníky v jedné řadě.\nKdyž zmáčkneš [accent]Ctrl[], řada dopravníků se bude umisťovat navíc úhlopříčně.\nPoužij [accent]kolečko myši[] pro otáčení bloku před umístěním.\n[accent]Umísti dopravníky tak, abys dopravil měď do jádra[]. hint.respawn = Aby ses znovu přepnul na loď, zmáčkni [accent][[V][].
tutorial.conveyor.mobile = Pro dopravu materiálu k jádru jsou zapotřebí [accent]dopravníky[].\nVytvoř řadu dopravníků od vrtu až k jádru.\n[accent]Pokládej dopravníky v řadě ťupnutím a delším prstu[] a táhnutím v požadovaném směru.\n[accent]Umísti dopravníky tak, abys dopravil měď do jádra[]. hint.respawn.mobile = Přepnul ses na ovládání jednotky nebo konstrukce. Aby ses přepnul zpět na loď, klikni na avatara vlevo nahoře.
tutorial.turret = Jakmile se materiál dostane do jádra, může být použit pro stavbu.\nPamatuj si, že ne všechno lze použít pro stavbu.\nVěci, které melze použít jako stavební materiál, jako například [accent]uhlí[] nebo [accent]šrot[], nelze do jádra uložit, a zasekne tak celý dopravník na vstupu.\nPro odehnání útočných jednotek [lightgray]nepřítele[] od jádra je třeba postavit obranné stavby.\nPostav [accent]střílnu Duo[] poblíž svého jádra. hint.desktopPause = Zmáčkni [accent][[mezerník][] k pozastavení a zase spuštění hry.
tutorial.drillturret = Střílny Duo potřebují jako střelivo [accent]měď[].\nPolož mechanický vrt blízko střílny.\nPro zásobování mědí veď dopravníky od vrtu ke střílně.\n\n[accent]Doručeno střeliva: {0}/{1}[] hint.placeDrill = Vyber si záložku \ue85e [accent]Vrtů[] v nabídce vpravo dole, potom vyber \uf870 [accent]Vrt[] a klikni na oblast s mědí k umístění.
tutorial.pause = Během hry, například v boji, můžeš [accent]pozastavit hru[].\nPři pozastavení můžeš naplánovat stavbu do fronty.\n\n[accent]Pozastav hru mezerkem[]. hint.placeDrill.mobile = Vyber si záložku \ue85e [accent]Vrtů[] v nabídce vpravo dole, potom vyber \uf870 [accent]Vrt[] a ťupni na oblast s mědí k umístění.\n\Ťupni na \ue800 [accent]zaškrtnutí[] vpravo dole pro potvrzení.
tutorial.pause.mobile = Během hry, například v boji, můžeš [accent]pozastavit hru[].\nPři pozastavení můžeš naplánovat stavbu do fronty.\n\n[accent]Pozastavení hry probedeš ťupnutím na dvě čárky vlevo nahoře. hint.placeConveyor = Dopravníky přesouvají materiál z vrtu do dalších bloků. Vyber \uf896 [accent]Dopravník[] ze záložky \ue814 [accent]Distribuce[].\n\nKlikni a táhni pro umístění vícero dopravníků.\n[accent]Roluj[] pro otočení.
tutorial.unpause = Teď zmáčkni mezerník znova a pokračuj ve hře. hint.placeConveyor.mobile = Dopravníky přesouvají materiál z vrtu do dalších bloků. Vyber \uf896 [accent]Dopravník[] ze záložky \ue814 [accent]Distribuce[].\n\nPodrž chvíli prst a táhni pro umístění vícero dopravníků.
tutorial.unpause.mobile = Teď ťupni na ikonu na stejném místě a pokračuj ve hře. hint.placeTurret = Umisti \uf861 [accent]Věž[], abys ubránil Tvoji základnu před nepřáteli.\n\nVěže vyžaduj munici - v tomto případě je jí \uf838měď.\nPoužij vrty a dopravníky, abys nějakou získal.
tutorial.breaking = Bloky je třeba nejen stavět, ale Často rozbít.\n[accent]Drž pravé tlačítko myšu[] a táhni s ní pro výběr bloků, které potřebuješ rozbít.\n\n[accent]Znič všechen šrot vlevo od Tvého jádra použitím blokového výběru[]. hint.breaking = Klikni [accent]pravým tlačítkem[] a potáhni pro rozbití bloků.
tutorial.breaking.mobile = Bloky je třeba nejen stavět, ale Často rozbít.\n[accent]Ťupnu na ikonku kladiva dole[] a pak ťupni na blok, který chceš rozbít.\nRozbití více bloků se provádí delším podržením prstu a táhnutím.\nRozbití dokončíš ťupnutím na fajfku.\n\n[accent]Znič všechen šrot vlevo od Tvého jádra použitím blokového výběru[]. hint.breaking.mobile = Použij \ue817 [accent]kladivo[] v pravém spodním rohu a pak ťupni pro rozbití bloků.\n\nPodrž chvíli prst a táhni pro rozbití bloků ve výběru.
tutorial.withdraw = Někdy je třeba odebírat předměty přímo z bloků.\n[accent]Klikni na blok[], ve kterém jsou předměty a pak [accent]klikni na předmět[] z inventáře bloku.\nVícero předmětů může být odebráno [accent]ťupnutím a držením[].\n\n[accent]Odeber trochu mědi z jádra[]. hint.research = Použij tlačítko \ue875 [accent]Výzkum[] pro vyzkoumání nové technologie.
tutorial.deposit = Vložit předměty do bloku můžeš přetažením z Tvé lodi na cílový blok.\n\n[accent]Vlož odebranou měď zprátky do Tvého jádra[]. hint.research.mobile = Použij tlačítko \ue875 [accent]Výzkum[] v \ue88c [accent]nabídce[] pro vyzkoumání nové technologie.
tutorial.waves = [lightgray]Nepřítel[] se přibližuje.\n\nUbraň své jádro po dobu 2 vln. [accent]Klikni levým tlačítkem[] pro střílení.\nPostav více střílen a vrtů. Natěž více mědi. hint.unitControl = Podrž [accent][[Levý Ctrl][] a [accent]klikni[] pro ovládání spřátelených jednotek nebo věží.
tutorial.waves.mobile = [lightgray]Nepřítel[] se přibližuje.\n\nUbraň své jádro po dobu 2 vln. Tvá loď bude automaticky střílet po nepřátelských jednotkách.\nPostav více střílen a vrtů. Natěž více mědi. hint.unitControl.mobile = [accent][[Dvojťupni][] pro ovládání spřátelených jednotek nebo věží.
tutorial.launch = Jakmile dosáhneš určité vlny, budeš moci [accent]vyslat své jádro zpět[]. Opustíš tím svou základnu a [accent]získáš suroviny uložené v jádře[].\nZískané suroviny mohou být použity pro výzkum nových technologií.\n\n[accent]Stiskni tlačítko pro vyslání jádra zpět[]. hint.launch = Jakmile je nasbíráno dostatek zdrojových materiálů, můžeš se [accent]vyslat[] do přilehlých sektorů z \ue827 [accent]mapy[] v pravém dolním rohu.
hint.launch.mobile = Jakmile je nasbíráno dostatek zdrojových materiálů, můžeš se [accent]vyslat[] do přilehlých sektorů z \ue827 [accent]mapy[] v the \ue88c [accent]nabídce[].
hint.schematicSelect = Podrž [accent][[F][] a potáhni pro výběr bloků, které chceš zkopírovat.\n\nKlikni na [accent][[prostřední tlačítko][] myši pro zkopírování jednoho typu bloku.
hint.conveyorPathfind = Podrž [accent][[levý Ctrl][], když táhneš dopravníky, pro automatické vygenerování cesty.
hint.conveyorPathfind.mobile = Povol \ue844 [accent]úhlopříčný režim[] a potáhni dopravníky pro automatické generování cesty.
hint.boost = Podrž [accent][[levý Shift][], abys přeletěl přes překážky se svou současnou jednotkou.\n\nPouze některé jednotky však mají takový posilovač.
hint.command = Zmáčkni [accent][[G][] pro vytvoření formace z blízkých jednotek [accent]podobného typu[].\n\nAbys mohl velet pozemní jednotce, musíš nejprve ovládat jinou pozemní jednotku.
hint.command.mobile = [accent][[Dvojťupni][] na Tvoji jednotku pro vytvoření formace z blízkých jednotek.
hint.payloadPickup = Zmáčkni [accent][[[] pro sebrání malých bloků nebo jednotek.
hint.payloadPickup.mobile = [accent]Ťupni a podrž[] na malém bloku nebo jednotce pro sebrání.
hint.payloadDrop = Zmáčkni [accent]][] pro položení nákladu.
hint.payloadDrop.mobile = [accent]Ťupni a drž[] na prázdném místě pro položení nákladu.
hint.waveFire = [accent]Naplň[] věže vodou místo munice pro automatické hašení okolních požárů.
hint.generator = \uf879 [accent]Spalovací generátory[] pálí uhlí a přenášení energii do sousedících bloků.\n\nPřenos energie na delší vzdálenost se provádí pomocí \uf87f [accent]Energetických uzlů[].
hint.guardian = Jednotky [accent]Strážce[] jsou obrněné. Měkká munice, jako je například [accent]měď[] a [accent]olovo[] je [scarlet]neefektivní[].\n\nPoužij vylepšené věže nebo \uf835 [accent]grafitovou[] munici pro \uf861 Střílnu Duo/\uf859 Salvu, abys Strážce sejmul.
hint.coreUpgrade = Jádro může být vylepšeno [accent]překrytím jádrem vyšší úrovně[].\n\nUmísti jádro typu [accent]Základ[] přes jádro typu [accent]Odštěpek[]. Ujisti se, že v okolí nejsou žádné překážky.
hint.presetLaunch = Na šedé [accent]sektory v přistávací zóně[], jako je například [accent]Zamrzlý les[], se lze vyslat kdykoli. Nevyžadují polapení okolního teritoria.\n\n[accent]Číslované sektory[], jako je tento, jsou [accent]volitelné[].
hint.coreIncinerate = Poté, co je kapacita jádra určité položky naplněna, jakékoliv další stejné přijaté položky budou [accent]zničeny[].
hint.coopCampaign = Když hraješ [accent]kooperativní kampaň[], položky, které jsou vyrobeny v této mapě, budou též zaslány [accent]do Tvých místních sektorů[].\n\nJakýkoliv vývoj dosažený hostitelem se též přenáší.
item.copper.description = Nejběžnější stavební materiál. Používá se ve všech typech bloků. item.copper.description = Používá se ve všech typech bloků a munice.
item.lead.description = Základní materiál. Používá se v energetických blocích a při přepravě kapalin. item.copper.details = Měď. Nezvykle nadpočetný kov na Serpulu. Konstrukčně slabý, pokud není rafinovaná.
item.metaglass.description = Velmi tvrdá skleněná sloučenina. Hodně používaná pro ukládání a rozvod kapalin. item.lead.description = Používá se v přepravě kapalin a energetických konstrukcích.
item.graphite.description = Mineralizovaný uhlík, používaný v energetických komponentách a též jako munice. item.lead.details = Hutný, netečný materiál. Hojně používán v bateriích.\nPoznámka: Pravděpodobně toxický pro biologické formy života. Ne že by jich tady moc zbývalo.
item.sand.description = Běžný materiál, který se hojně používá při slévání a tavení. item.metaglass.description = Používá se v přepravě kapalin a úložných konstrukcích.
item.coal.description = Zkamenělé rostliny, zformované dávno před vznikem mapy. Používané běžně jako palivo a pro vyrobu dalších materálů. item.graphite.description = Používá se v energerických komponentách a nábojích do věží.
item.titanium.description = Vzácný, velice lehký kov, využívaný hojně při přepravě kapalin, ve vrtech a při výrobě letových strojů. item.sand.description = Používá se ve výrobě ostatních rafinovaných materiálů.
item.thorium.description = Hutný, radioaktivní materiál, využívaný jako strukturální podpora a nuklearní palivo. item.coal.description = Používá se na palivo a výrobu rafinovaný materiálů.
item.scrap.description = Zbytky starých struktur a jednotek. Obsahuje stopové množství mnoha různých kovů. item.coal.details = Jeví se být zkamenělou rostlinou hmotou, zformovaou dávno před událostí vytvoření tohoto světa náhodným číslem.
item.silicon.description = Extrémně užitečný polovodič. Využívá se v solárních panelech, pokročilých energetických blocích a jako munice do samonaváděcích střel ve střílnách. item.titanium.description = Používá se v konstrukcích pro přepravu kapalin, ve vrtácích a letectví.
item.plastanium.description = Lehký, kujný materiál, využívaný v pokročilém letectví a jako tříštivá munice. item.thorium.description = Používá se v bytelných konstrukcích a též jako nukleární palivo.
item.phase-fabric.description = Takřka nehmotná substance používaná v pokročilých energetických blocích a v samoopravných technologiích. item.scrap.description = Používá se v tavičích a drtičích pro rafinaci na jiné materiály.
item.surge-alloy.description = Vyspělá slitina s jedinečnými energetickými vlastnostmi. item.scrap.details = Zbytky zbytků starých konstrukcí a jednotek.
item.spore-pod.description = Umělé spór, syntetizované pro průmyslové účely z atmosférických koncentrací. Jejich využití spočívá v přeměně na naftu, výbušniny a jako palivo. item.silicon.description = Používá se v solárních panelech, komplexní elektronice a samonaváděcích střelách do obraných věží.
item.blast-compound.description = Nestálá směs používaná v bombách a výbušninách. Syntetizuje se ze spórových tobolek a těkavých substancí. Nedoporučuje se využívat jako palivo. item.plastanium.description = Používá se v pokročilých jednotkách, izolaci a tříštivé munici.
item.pyratite.description = Extrémně vznětlivá substance, používaná ve zápalném střelivu. item.phase-fabric.description = Používá se v pokročilé elektronice a samoopravných konstrukcích.
liquid.water.description = Nejužitečnější kapalina. Hojně využívaná jak chlazení do strojů a též pro výrobu spór. item.surge-alloy.description = Používá se v pokročilém zbrojnictví a reakčních obranných konstrukcích.
liquid.slag.description = Různé různé druhy roztaveného kovu smíchané dohromady. Lze je rozdělit na jednotlivé minerály, nebo se tato slitina dá použít jako munice při střílení na nepřátelské jednotky. item.spore-pod.description = Používá se pro přeměnu na ropu, výbušniny a palivo.
liquid.oil.description = Kapalina použitá při pokročilé výrobě materiálů. Může být přeměněna na uhlí, nebo při rozprášení a zapálení použita jako zbraň. item.spore-pod.details = Spóry. Pravděpodobně syntetická forma života. Vydává plyn toxický pro jiné formy života. Extrémně invazivní. Vysoce hořlavý za určitých podmínek.
liquid.cryofluid.description = Netečná, nereznoucí kapalina, vytvořená z vody a titanu. Má extrémně vysokou tepelnou kapacitu. Hojně se používá jako chladicí kapalina. item.blast-compound.description = Používá se v bombách a výbušné munici.
item.pyratite.description = Používá se v zápalných zbraních a spalovacích generátorech.
block.message.description = Ukládá zprávu. Používá se pro komunikaci mezi spojenci. liquid.water.description = Používá se pro chladící stroje a na zpracování odpadu.
block.graphite-press.description = Přeměňuje neforemné kusy uhlí do ušlechtilých výlisků grafitu. liquid.slag.description = Používá se v oddělovačích pro rozdělení na jednotlivé kovy, nebo je chrlena na protivníky z věží.
block.multi-press.description = Vylepšená verze lisu na grafit. Využívá vodu a energii k rychlejšímu a efektivnějšímu zpracování uhlí. liquid.oil.description = Používá se v pokročilé materiálové výrobě a jako zápalná munice.
block.silicon-smelter.description = Redukuje písek vyčištěným uhlím, čímž vyrábí křemík. liquid.cryofluid.description = Používá se jako chladící kapalina v reaktorech, věžích a továrnách.
block.kiln.description = Taví písek a olovo na směs známou jako metasklo. Vyžaduje k běhu malé množství energie.
block.plastanium-compressor.description = Produkuje plastanu z titanu a nafty. block.resupply-point.description = Zásobuje okolní jednotky měděnou municí. Není kompatibilní s jednotkami, které vyžadují energii z baterie.
block.phase-weaver.description = Produkuje fázovou tkaninu z radioaktivního thoria a písku. Spotřebuje k tomu výrazné množství energie. block.armored-conveyor.description = Přepravuje předměty vpřed. Nepřijímá předměty ze stran.
block.alloy-smelter.description = Produkuje rázovou slitinu z titanu, olova, křemíku a mědi. block.illuminator.description = Vydává světlo.
block.cryofluid-mixer.description = Míchá vodu a jemný titanová prášek do chladící kapaliny, nezbytné například pro thoriový reaktor. block.message.description = Ukládá zprávu pro komunikaci mezi spojenci.
block.blast-mixer.description = Drtí a míchá shluky spór s pyratitem, čímž vzniká výbušnina. block.graphite-press.description = Lisuje uhlí na grafit.
block.pyratite-mixer.description = Míchá uhlí, olovo a písek do vysoce hořlavého pyratitu. block.multi-press.description = Lisuje uhlí na grafit. Vyžaduje vodu jako chladivo.
block.melter.description = Taví šrot do roztaveného kovu pro další zpracování, nebo pro munici do střílny Vlna. block.silicon-smelter.description = Rafinuje křemík z písku a uhlí.
block.separator.description = Odděluje z roztaveného kovu jednotlivé minerální součásti, které na výstupu zchlazuje do pevné formy. block.kiln.description = Taví písek a olovo na metasklo.
block.spore-press.description = Lisuje ze spór pod enormním tlakem naftu. block.plastanium-compressor.description = Produkuje plastan z titanu a nafty.
block.phase-weaver.description = Syntetizuje fázovou tkaninu z thoria a písku.
block.alloy-smelter.description = Taví titan, olovo, křemík a měď na rázovou slitinu.
block.cryofluid-mixer.description = Míchá vodu a jemný titanová prášek na chladící kapalinu.
block.blast-mixer.description = Vyrábí výbušninu z pyratitu a shluků spór.
block.pyratite-mixer.description = Míchá uhlí, olovo a písek na pyratit.
block.melter.description = Taví šrot na strusku.
block.separator.description = Odděluje ze strusky jednotlivé minerální součásti.
block.spore-press.description = Lisuje skluhy spór na naftu.
block.pulverizer.description = Drtí šrot na jemný písek. block.pulverizer.description = Drtí šrot na jemný písek.
block.coal-centrifuge.description = Tuhne naftu do kusů uhlí. block.coal-centrifuge.description = Přetváří naftu na uhlí.
block.incinerator.description = Vypaří jakékoliv nadbytečné předměty nebo kapaliny, které mu pošleš. block.incinerator.description = Vypařuje jakékoliv předměty nebo kapaliny, které obdrží.
block.power-void.description = Zničí jakoukoliv energii, kterou bloku pošleš. Jen pro režim Pískoviště. block.power-void.description = Zničí jakoukoliv energii na vstupu. Jen v režimu Pískoviště.
block.power-source.description = Nekonečný zdroj energie. Jen pro Pískoviště. block.power-source.description = Nekonečný zdroj energie. Jen v režimu Pískoviště.
block.item-source.description = Nekonečný zdroj předmětů. Jen pro Pískoviště. block.item-source.description = Nekonečný zdroj předmětů. Jen v režimu Pískoviště.
block.item-void.description = Zničí jakýkoliv vstupní předmět, který bloku pošleš. Jen pro Pískoviště. block.item-void.description = Zničí jakýkoliv vstupní předmět, který bloku pošleš. Jen v režimu Pískoviště.
block.liquid-source.description = Nekonečný zdroj kapalin. Jen pro Pískoviště. block.liquid-source.description = Nekonečný zdroj kapalin. Jen v režimu Pískoviště.
block.liquid-void.description = Zničí jakoukoliv kapalinu, kterou bloku pošleš. Jen pro Pískoviště. block.liquid-void.description = Zničí jakoukoliv kapalinu, kterou bloku pošleš. Jen v režimu Pískoviště.
block.copper-wall.description = Levný obranný blok.\nUžitečný k obraně Tvého jádra a střílen pro prvních několik vln nepřátel. block.copper-wall.description = Chrání konstrukce před nepřátelskými střelami.
block.copper-wall-large.description = Levný obranný blok.\nUžitečný k obraně Tvého jádra a střílen pro prvních několik vln nepřátel.\nZabírá více dlaždic. block.copper-wall-large.description = Chrání konstrukce před nepřátelskými střelami.
block.titanium-wall.description = Středně silný obranný blok.\nPoskytuje středně dobrou obranu proti nepřátelům. block.titanium-wall.description = Chrání konstrukce před nepřátelskými střelami.
block.titanium-wall-large.description = Středně silný obranný blok.\nPoskytuje středně dobrou obranu proti nepřátelům.\nZabírá více dlaždic. block.titanium-wall-large.description = Chrání konstrukce před nepřátelskými střelami.
block.plastanium-wall.description = Speciální typ zdi, která je schopná absorbovat energetické výboje a blokuje automaticky energetické vedení, například mezi uzly. block.plastanium-wall.description = Chrání konstrukce před nepřátelskými střelami. Pohlcuje laserové a energetické výboje. Automaticky blokuje energetické spoje.
block.plastanium-wall-large.description = Speciální typ zdi, která je schopná absorbovat energetické výboje a blokuje automaticky energetické vedení, například mezi uzly.\nZabírá více dlaždic. block.plastanium-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Absorbs lasers and electric arcs. Automaticky blokuje energetické spoje.
block.thorium-wall.description = Silný obranný blok.\nSlušná obrana před nepřáteli. block.thorium-wall.description = Chrání konstrukce před nepřátelskými střelami.
block.thorium-wall-large.description = Silný obranný blok.\nSlušná obrana před nepřáteli.\nZabírá více dlaždic. block.thorium-wall-large.description = Chrání konstrukce před nepřátelskými střelami.
block.phase-wall.description = Zeď potažená speciální odrazivou sloučeninou na fázové bázi. Odráží při nárazu většinu střel. block.phase-wall.description = Chrání konstrukce před nepřátelskými střelami, reflecting most bullets upon impact.
block.phase-wall-large.description = Zeď potažená speciální odrazivou sloučeninou na fázové bázi. Odráží při nárazu většinu střel.\nZabírá více dlaždic. block.phase-wall-large.description = Chrání konstrukce před nepřátelskými střelami, reflecting most bullets upon impact.
block.surge-wall.description = Extrémně odolný obranný blok.\nPři zásahu střelou akumuluje energii, kterou pak náhodně uvolňuje ve formě výboje. block.surge-wall.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává energetické výboje.
block.surge-wall-large.description = Extrémně odolný obranný blok.\nPři zásahu střelou akumuluje energii, kterou pak náhodně uvolňuje ve formě výboje.\nZabírá více dlaždic. block.surge-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává energetické výboje.
block.door.description = Malé dveře, které se dají otevřít nebo zavřít kliknutím/tupnutím na ně. block.door.description = Zeď, která může být otevřena a zavřena.
block.door-large.description = Velké dveře, které se dají otevřít nebo zavřít kliknutím/ťupnutím na ně.\nZabírají více dlaždic. block.door-large.description = Zeď, která může být otevřena a zavřena.
block.mender.description = Pravidelně opravuje bloky ve svém poli působnosti. Dobré pro opravu obranného systému mezi vlnami.\nVolitelně lze využít křemíku pro posílení dosahu a efektivity. block.mender.description = Opakovaně opravuje bloky ve svém dosahu.\nVolitelně umí použít křemík pro posílení dosahu a efektivity.
block.mend-projector.description = Vylepšená verze Opraváře. Opravuje bloky ve svém poli působnosti.\nVolitelně lze využít fízové tkaniny pro posílení dosahu a efektivity. block.mend-projector.description = Opakovaně opravuje bloky ve svém dosahu.\nVolitelně umí použít fázovou tkaninu pro posílení dosahu a efektivity.
block.overdrive-projector.description = Zrychluje funkce budov v okolí.\nVolitelně lze využít křemíku pro posílení dosahu a efektivity. block.overdrive-projector.description = Zrychluje funkce budov v okolí.\nVolitelně umí využít fázovou tkaninu pro posílení dosahu a efektivity.
block.force-projector.description = Vytvoří okolo sebe šestihrané silové pole, které chrání jednotky a budovy uvnitř před poškozením.\nPokud dostane moc poškození, tak se přehřeje. Volitelně lze použít chlazení pro snížení přehřívání a fázové tkaniny pro zvětšené dosahu štítu. block.force-projector.description = Vytváří okolo sebe šestiúhelníkové silové pole. Chrání konstrukce a jednotky uvnitř pole před poškozením.\nPřehřívá se, pokud obdrží moc poškození. Přehřátí lze eliminovat použitím chlazení. Fázová tkanina zvyšje velikost pole.
block.shock-mine.description = Působí poškození nepřátelským jednotkám při sešlápnutí. Takřka neviditelné pro nepřátele (a i v nabídce bloků :) ). block.shock-mine.description = Vydává energetické výboje při dotyku nepřátelskou jednotkou.
block.conveyor.description = Základní blok pro přepravu předmětů. Unáší předměty kupředu a automaticky plní vhodná úložiště (budovy, kontejnery, jádro), které po cestě potká. Lze jej otáčet dle potřeby. block.conveyor.description = Přepravuje předměty vpřed.
block.titanium-conveyor.description = Pokročilý blok pro přepravu předmětů. Přenáší předměty rychleji, než základní dopravník. block.titanium-conveyor.description = Přepravuje předměty vpřed. Rychlejší, než standardní dopravník.
block.plastanium-conveyor.description = Přesouvá položky v dávkích.\nPřijímá položky zezadu, a vykládá je do tří směrů vepředu.\nPro špičkový průchod vyžaduje několik nakládacích a vykládacích míst. block.plastanium-conveyor.description = Přepravuje předměty vpřed in batches. Přijímá předměty zezadu, a vykládá je do tří směrů vpředu. Vyžaduje více nakládacích a vykládacích bodů pro špičkový průtok.
block.junction.description = Chová se jako most pro dva křížící se pásy dopravníků. Užitečný při situaci, kdy dva rozdílné dopravníky dopravují dva rozdílné materiály přes jedno pole. block.junction.description = Funguje jako most pro dva křížící se dopravníky.
block.bridge-conveyor.description = Pokročilý blok pro přepravu předmětů. Dovoluje transport předmětů až přes tři pole, a to přes jakýkoliv terén nebo budovu. block.bridge-conveyor.description = Přepravuje předměty přes terén nebo budovy.
block.phase-conveyor.description = Pokročilý blok pro přepravu předmětů. Využívá energii k teleportaci předmětů na vzdálenost několika dlaždic mezi jiným propojeným fázovým dopravníkem. block.phase-conveyor.description = Okamžitě přepravuje předměty přes terén nebo budovy. Má delší dosah než standardní přemostění přepravníku, ale vyžaduje energii.
block.sorter.description = Třídí předměty. Pokud je předmět shodný s výběrem, je poslán rovně dál. Jinak je předmět je odbočen do strany. block.sorter.description = Pokud vstupní položka odpovídá výběru, je předána vpřed. Jinak je vyložena napravo a nalevo.
block.inverted-sorter.description = Třídí předměty. Pokud je předmět shodný s výběrem, je odbočen do strany. Jinak je předmět je poslán rovně dál. block.inverted-sorter.description = Podobné stanrdardní třídičce, ale vykládá vybrané položky do stran.
block.router.description = Přijímá předměty z jednoho směru a posílá je rovnoměrně do zbylých tří směrů. Užitečný pro rozdělení předmětů z jednoho zdroje do různých cílů, jako odbočení z dopravníků a podobně.\n\n[scarlet]Pozor, nepoužívejte pro vstup do produkční budovy, jinak se bude ucpávat výstupními předměty[]. block.router.description = Rozděluje vstupní položky rovnoměrně do tří výstupů.
block.distributor.description = Pokročilý směrovač. Rozděluje předměty rovnoměrně až do 7 dalších směrů. block.router.details = Nezbytné zlo. Použití hned u produkčních vstupů se nedoporučuje, protože budou ucpány výstupnímk položkami.
block.overflow-gate.description = Předměty jsou poslány do strany, pokud je směr vpřed zablokován. Užitečné například pro zpracování přebytečného materiálu, pokud je primární příjemce saturován. block.distributor.description = Rozděluje vstupní položky rovnoměrně do sedmi výstupů.
block.underflow-gate.description = Předměty jsou poslány vpřed, pokud je směr do strany zablokován. Užitečné například pro zpracování přebytečného materiálu, pokud je primární příjemce saturován. block.overflow-gate.description = Pokud je směr vpřed ucpán, posí vstupní položky do stran. Nelze použít vedle jiné brány.
block.mass-driver.description = Ultimátní blok pro přepravu předmětů. Sebere několik předmětů a vystřelí je k dalšímu hromadnému směřovači přes několik dlaždic. Vyžaduje ke své funkci energii. block.underflow-gate.description = Pokud je směr do stran ucpán, posílá vstupní položky vpřed. Nelze použít vedle jiné brány.
block.mechanical-pump.description = Levné čerpadlo s pomalým průtokem, nevyžaduje však energii k provozu. block.mass-driver.description = Konstrukce pro přepravu položek na velkou vzdálenost. Sesere dávku položek a vystřelí ji k dalšímu hromadnému přenašeči.
block.rotary-pump.description = Pokročilé čerpadlo, které za pomoci energie vyčerpá větší množství kapalin, než standardní. block.mechanical-pump.description = Pumpuje kapalinu a předává ji dál. Nevyžaduje energii.
block.thermal-pump.description = Ultimátní čerpadlo. Nejrychlejší čerpání kapalin. block.rotary-pump.description = Pumpuje kapalinu a předává ji dál. Vyžaduje energii.
block.conduit.description = Základní blok pro přepravu kapalin. Unáší kapaliny vpřed. Používá se s čerpadly, v některých vrtech a nebo ve spojení s jiným potrubím. block.thermal-pump.description = Pumpuje kapalinu a předává ji dál.
block.pulse-conduit.description = Pokročilý blok přepravy kapalin. Přepravuje kapaliny rychleji a má větší kapacitu, než základní potrubí. block.conduit.description = Přepravuje kapaliny vpřed. Používá se spolu s pumpami a dalším potrubím.
block.plated-conduit.description = Přenáší kapaliny stejně rychle jako pulzní potrubí, ale díky oplátování má větší výdržnost. Ze stran přijímá kapaliny pouze z dalších potrubí.\nNedochází zde k úniku kapalin. block.pulse-conduit.description = Přepravuje kapaliny vpřed. Přepravuje kapaliny rychleji a ukládá jich více, než standadní potrubí.
block.liquid-router.description = ijímá kapaliny z jednoho směru a vypouští je rovnoměrně do zbylých tří směrů. Dokáže pojmout i určitý objem kapalin do vnitřího úložiště. Používá se při rozdělení kapaliny z jednoho zdroje směřující do různých cílů. block.plated-conduit.description = epravuje kapaliny vpřed. Nepřijímá kapaliny ze stran. Nemá úniky.
block.liquid-tank.description = Ukládá velké množství kapalin. Používá se pro vyrovnávání zásob vody, když je přítok nestabilní nebo jako záložní chlazení pro životně důležité stavby. block.liquid-router.description = Přijímá kapalinu z jednoho směru a vydává ji rovnomerně do tří ostatních stran. Umí též uchovat malé množství kapaliny.
block.liquid-junction.description = Chová se jako most pro dvě křížící se potrubí. Používá se v situacích, kdy dvě rozdílná potrubí vedou rozdílný obsah přes jedno místo. block.liquid-tank.description = Ukládá velké množství kapaliny. Předává ji do stran, podobně jako směřovač kapalin.
block.bridge-conduit.description = Pokročilý blok přepravy kapalin. Dovoluje přenášet kapaliny přes tři dlaždice napříč jakýmkoliv terénem nebo přes budovy. block.liquid-junction.description = Funguje jako most pro dvě křížící se potrubí.
block.phase-conduit.description = Pokročilý blok pro přepravu kapalib. Využívá energii k teleportaci kapalin na vzdálenost několika dlaždic mezi jiným propojeným fázovým potrubím. block.bridge-conduit.description = Přepravuje kapalinu přes terén a budovy.
block.phase-conduit.description = Přepravuje kapalinu přes terén a budovy. Má delší dosah než standardní přemostění potrubí, ale vyžaduje energii.
block.power-node.description = Přenáší energii mezi propojenými uzly. Uzel získává energii z nebo dodává energii do bloků ve svém poli působnosti. block.power-node.description = Přenáší energii mezi propojenými uzly. Uzel získává energii z nebo dodává energii do bloků ve svém poli působnosti.
block.power-node-large.description = Pokročilý energerický uzel. Má větší dosah než základní uzel. block.power-node-large.description = Pokročilý energerický uzel. Má větší dosah než základní uzel.
block.surge-tower.description = Energetický uzel s extrémním dosahem, ale méně dostupnými přípojkami pro ostatní bloky, než ostatní uzly. block.surge-tower.description = Energetický uzel s dlouhým dosahem, ale méně dostupnými přípojkami pro ostatní bloky, než ostatní uzly.
block.diode.description = Energie z baterie přes tento blok protéká jen jedním směrem, a to jen za podmínky, že a druhé straně je méně energie (například vybitá baterie). block.diode.description = Energie z baterie přes tento blok protéká jen jedním směrem, a to jen za podmínky, že na druhé straně je méně energie (například vybitá baterie).
block.battery.description = Ukládá energii v případě nadbytku v síti a poskytuje energii kdykolik, když se energetické síti nedostává (záporný rozdíl). block.battery.description = Ukládá energii v případě nadbytku v síti a poskytuje energii kdykolik, když se energetické síti nedostává.
block.battery-large.description = Ukládá více energie, než základní baterie. block.battery-large.description = Ukládá energii v případě nadbytku v síti a poskytuje energii kdykolik, když se energetické síti nedostává. Ukládá více energie než základní baterie.
block.combustion-generator.description = Generuje energii spalováním hořlaných materiálů, jako je například uhlí. block.combustion-generator.description = Generuje energii spalováním hořlaných materiálů, jako je například uhlí.
block.thermal-generator.description = Pokud je umístěn na teplotně aktivní místo (jako je magmatický kámen), dokáže z tepla generovat energii. block.thermal-generator.description = Pokud je umístěn na teplotně aktivní místo (jako je magmatický kámen), dokáže z tepla generovat energii.
block.steam-generator.description = Pokročilý spalovací generátor. Efektivnější, ale vyžaduje dodatečný přísun vody pro produkci páry. block.steam-generator.description = Vytváří energii spalováním hořlavých materiálů a měněním vody na páru.
block.differential-generator.description = Generuje velké množství energie. Využívá teplotního rozdílu mezi chladící kapalinou a hořícím pyratitem. block.differential-generator.description = Generuje velké množství energie. Využívá teplotního rozdílu mezi chladící kapalinou a hořícím pyratitem.
block.rtg-generator.description = Radioizotopní termoenergetický generátor (RTG) je jednoduchý, spolehlivý generátor. Využívá tepla z rozpadu radioaktivních složek ke generování menších dávek energie. block.rtg-generator.description = Používá teplo z rozpadajících se radioaktivních materiálů k výrobě energie v malých dávkách.
block.solar-panel.description = Základní solární panel pro generoní malého množství energie ze Slunce. block.solar-panel.description = Vytří malého množství energie ze Slunce.
block.solar-panel-large.description = Výrazně efektivnější verze solárního panelu pro generování energie ze Slunce. block.solar-panel-large.description = Vytváří malého množství energie ze Slunce. Efektivnější, než základní solárí panel.
block.thorium-reactor.description = Generuje významné množství energie z thoria. Vyžaduje nepřetržité chlazení. Je-li chlazen nedostatečně, způsobí značnou explozi. Výstup energie závisí na míře naplnění generátoru, základní generování energie se aktivuje při plné kapacitě. block.thorium-reactor.description = Generuje významné množství energie z thoria. Vyžaduje nepřetržité chlazení. Je-li chlazen nedostatečně, způsobí značnou explozi.
block.impact-reactor.description = Vyspělý generátor, schopný vytvářet při maximálním výkonu obrovská množství energie. Vyžaduje však značné množství energie pro nastartování celého procesu. block.impact-reactor.description = Vytváří při špičkové účinnosti velké množství energi. Vyspělý generátor, schopný vytvářet při maximálním výkonu obrovská množství energie. Vyžaduje však značné množství energie pro nastartování celého procesu.
block.mechanical-drill.description = Levný vrt. Při položení na vhodné pole (ruda, písek) natrvalo a pomalu produkuje odpovídající materiál. Umí těžit jen základní rudy. block.mechanical-drill.description = Když je umístěn na rudu, generuje donekonečna odpovídající položky, pomalou rychlostí. Použitelný jen pro těžení základních surovin.
block.pneumatic-drill.description = Vylepšený vrt, který je schopen těžit i titan. Těží vyšší rychlostí než mechanický vrt. block.pneumatic-drill.description = Vylepšený vrt, který je schopen těžit i titan. Těží vyšší rychlostí než mechanický vrt.
block.laser-drill.description = Vrtá rychleji než penumatický vrt díky laserové technologii, ale vyžaduje ke svému fungování energii. Dokáže navrtat i rudné žíly thoria. block.laser-drill.description = Vrtá rychleji než penumatický vrt díky laserové technologii, ale vyžaduje ke svému fungování energii. Dokáže navrtat i rudné žíly thoria.
block.blast-drill.description = Ultimátní vrt, vyžadující k provozu značné množství energie. block.blast-drill.description = Ultimátní vrt, vyžadující k provozu značné množství energie.
block.water-extractor.description = Extrahuje podzemní vodu. Vhodný pro místa, kde se nevyskytuje povrchová voda. block.water-extractor.description = Extrahuje podzemní vodu. Vhodný pro místa, kde se nevyskytuje povrchová voda.
block.cultivator.description = Kultivuje drobounké koncentrace spór v atmosféře do formy vhodné pro průmyslové využití spór. block.cultivator.description = Kultivuje drobounké koncentrace atmosférických spór do spórových polštářků.
block.cultivator.details = Zachráněná technologie. Používá se k výrobě obrovského množství biomasy tak efektivně, jak jen to jde. Pravděpodobně se původně jednalo o inkubátor spó, které nyní pokrývají Serpulo.
block.oil-extractor.description = Vyžaduje značné množství energie, písku a vody na těžení nafty. block.oil-extractor.description = Vyžaduje značné množství energie, písku a vody na těžení nafty.
block.core-shard.description = První verze jádra. Pokud je zničeno, veškerý kontakt s mapou je ztracen. Nedopusť, aby se to stalo. block.core-shard.description = Jádro základny. Pokud je zničena, sektor je ztracen.
block.core-foundation.description = Druhá cerze jádra. Je lépe obrněná a pojme více surovin. block.core-shard.details = První iterace. Kompaktní. Sebereplikující. Vybavená vysílacím pohonem na jedno použití. Není navržena pro meziplanetární cestování.
block.core-nucleus.description = Třetí a konečná iterace vývoje jádra. Velmi dobře obrněná. Dokáže skladovat významné množství zdrojů. block.core-foundation.description = Jádro základny. Dobře opevněná. Pojme více surovin, než základna Odstěpek.
block.core-foundation.details = Druhá iterace.
block.core-nucleus.description = Jádro základny. Velmi dobře opevněná. Dokáže skladovat enormní množství zdrojů.
block.core-nucleus.details = Třetí a konečná iterace vývoje jádra.
block.vault.description = Ukládá velké množství předmětů od každého typu. K vyskladnění věcí z trezoru je možné použít odbavovač. block.vault.description = Ukládá velké množství předmětů od každého typu. K vyskladnění věcí z trezoru je možné použít odbavovač.
block.container.description = Ukládá menší množství předmětů od každého typu. K vyskladnění věcí z kontejneru je možné použít odbavovač. block.container.description = Ukládá menší množství předmětů od každého typu. K vyskladnění věcí z kontejneru je možné použít odbavovač.
block.unloader.description = Vyskladňuje předměty z kontejneru, trezoru nebo jádra na dopravník nebo přímo do produktivních bloků. Druh předmětu pro vyskladnění lze nastavit kliknutím nebo ťupnutím na odbavovač. block.unloader.description = Vyskladňuje vybrané položky z okolních bloků.
block.launch-pad.description = Vysílá dávky předmětů z mapy bez nutnosti vyslat zpět jádro. block.launch-pad.description = Vysílá dávky předmětů do přilehlých sektorů.
block.launch-pad-large.description = Vylepšená verze vysílací plošiny. Má větší úložný prostor a vysílá předměty z mapy častěji. block.duo.description = Střílí střídavé dávky kulek na nepřátele.
block.duo.description = Malá, levná střílna. Užitečná proti pozemním jednotkám. block.scatter.description = Střílí kusy olova, pláty šrotu nebo střepy metaskla na nepřátelské letectvo.
block.scatter.description = Základní protivzdušná střílna. Střílí kusy olova, pláty šrotu nebo střepy metaskla na nepřátelské jednotky.
block.scorch.description = Sežehne pozemní jednotky blízkosti. Velmi efektivní na malé vzdálenosti. block.scorch.description = Sežehne pozemní jednotky blízkosti. Velmi efektivní na malé vzdálenosti.
block.hail.description = Malá dělostřelecká střílna na delší vzdálenosti. block.hail.description = Střílí na dálku malé patrony na pozemní nepřátele.
block.wave.description = Středně velká střílna. Pálí po nepřítelích proudy kapaliny (například roztaveného kovu). Umí automaticky uhasit oheň, pokud je zásobena vodou. block.wave.description = Střílí po nepřátelích proudy kapaliny (například strusky). Umí automaticky uhasit oheň, pokud je zásobena vodou.
block.lancer.description = Středně velká střílna proti pozemním jednotkám. Po nabití se střílí mocné energetické paprsky. block.lancer.description = Po nabití střílí mocné energetické paprsky na pozemní cíle.
block.arc.description = Malá energetická střílna. Pálí výboje po nepřátelských jednotkách. block.arc.description = Střílí výboje po pozemních jednotkách.
block.swarmer.description = Středně velká střílna s raketami. Útočí na pozemní i vzdušné cíle. Pálí samonaváděcí střely. block.swarmer.description = Střílí po nepřátelích samonaváděcí střely.
block.salvo.description = Větší, pokročilejší verze střílny Duo. Pálí na nepřátele rychlé dávky střel. block.salvo.description = Střílí na nepřátele rychlé dávky střel.
block.fuse.description = Velká střílna s krátkým dosahem. Pálí trojici pronikavých výbuchů na blízké nepřátele. block.fuse.description = Střílí trojici pronikavých výbuchů na blízké nepřátele.
block.ripple.description = Extrémně silná dělostřelecká střílna. Pálí na dálku shluky střel na nepřátelské jednotky. block.ripple.description = Střílí na dálku shluky střel na pozemní jednotky.
block.cyclone.description = Velká protiletecká a protipozemní střílna. Pálí explodující dávky na nepřítele v okolí. block.cyclone.description = Střílí vybuchující dávky na blízké nepřátele.
block.spectre.description = Velká střílna s kanónem s dvěma hlavněmi. Střílí velké náboje, které pronikají brněním jak pozemních, tak vzdušných nepřátelských cílů. block.spectre.description = Střílí velké náboje, které pronikají brněním jak pozemních, tak vzdušných cílů.
block.meltdown.description = Masivní laserový kanón. Nabije se a pak pálí nepřetržitý laserový paprsek na nepřátele v okolí. Vyžaduje ke své funkci chlazení. block.meltdown.description = Po nabití střílí nepřetržitý laserový paprsek na nepřátele v okolí. Vyžaduje ke své funkci chlazení.
block.repair-point.description = Nepřetržitě léčí nejbližší poškozenou jednotku v poli své působnosti. block.repair-point.description = Nepřetržitě opravuje nejbližší poškozenou jednotku v poli své působnosti.
block.segment.description = Poškozuje a ničí příchozí střely. Laserové střely ale zacílit neumí. block.segment.description = Poškozuje a ničí příchozí střely. Laserové střely ale zacílit neumí.
block.parallax.description = Střílí tažný paprsek, který přitahuje vzdušné cíle, a poškozuje je.
block.tsunami.description = Střílí mocné proudy kapalin na nepřátele. Samočinně hasí oheň, pokud je zásobován vodou.
block.silicon-crucible.description = Rafinuje křemík z písku a uhlí za použití pyratitu jako přídavného zdroje tepla. Účinnější na horkých místech.
block.disassembler.description = Odděluje ze strusky stopové množství exotických minerálových součástí při malé účinnosti. Umí vyrobit thorium.
block.overdrive-dome.description = Zvyšuje rychlost okolních konstrukcí. Vyžaduje ke svému fungování fázovou tkaninu a křemík.
block.payload-conveyor.description = Přesouvá velké náklady, jako jednotky z továren.
block.payload-router.description = Rozděluje vstuní náklad na 3 výstupní směry.
block.command-center.description = Ovládá chování jednotky několika příkazy.
block.ground-factory.description = Vyrábí pozemní jednotky. Výstupní jednotky mohou být použity přímo, nebo přesunuty do přestavovačů na vylepšení.
block.air-factory.description = Vyrábí letecké jednotky. Výstupní jednotky mohou být použity přímo, nebo přesunuty do přestavovačů na vylepšení.
block.naval-factory.description = Vyrání námořní jednotky. Výstupní jednotky mohou být použity přímo, nebo přesunuty do přestavovačů na vylepšení.
block.additive-reconstructor.description = Vylepšuje vstupní jednotky na druhou úroveň.
block.multiplicative-reconstructor.description = Vylepšuje vstupní jednotky na třetí úroveň.
block.exponential-reconstructor.description = Vylepšuje vstupní jednotky na čtvrtou úroveň.
block.tetrative-reconstructor.description =Vylepšuje vstupní jednotky na pátou, konečnou úroveň.
block.switch.description = Přepínač. Jeho stav je možné číst a ovládat logickými procesory.
block.micro-processor.description = Spouští posloupnost logických instrukcí ve smyčce. Dá se použít k ovládání jednotek a konstrukcí.
block.logic-processor.description = Spouští posloupnost logických instrukcí ve smyčce. Dá se použít k ovládání jednotek a konstrukcí. Rychlejší než mikroprocesor.
block.hyper-processor.description = Spouští posloupnost logických instrukcí ve smyčce. Dá se použít k ovládání jednotek a konstrukcí. Rychlejší než logický procesor.
block.memory-cell.description = Ukládá informace z logického procesoru.
block.memory-bank.description = Ukládá informace z logického procesoru. Větší kapacita.
block.logic-display.description = Zobrazuje libovolnou grafiku z logického procesoru.
block.large-logic-display.description = Zobrazuje libovolnou grafiku z logického procesoru.
block.interplanetary-accelerator.description = Masivní elektromagnetická věž. Urychlí jádro na únikovou rychlost pro meziplanetární vyslání.
unit.dagger.description = Střílí základní střely na všechny okolní nepřátele.
unit.mace.description = Střílí proudy ohně na všechny okolní nepřátele.
unit.fortress.description = Střílí dělostřelecké salvy na pozemní cíle.
unit.scepter.description = Střílí palbu nabitých střel na všechny okolní nepřátele.
unit.reign.description = Střílí palbu masivních střel pronikajících brněním na všechny okolní nepřátele.
unit.nova.description = Střílí laserové výboje, které poškozují nepřátele a opravují spojenecké konstrukce. Je schopný letu.
unit.pulsar.description = Střílí energetické oblouky, které poškozují nepřátele a opravují spojenecké struktury. Schopný letu.
unit.quasar.description = Střílí pronikavé laserové paprsky, které poškozují nepřátele a opravují spojenecké struktury. Schopný letu. Oštítovaný.
unit.vela.description = Střílí masivní nepřetržitý laserový paprsek, který poškozuje nepřátele, způsobuje požáry a opravuje spojenecké struktury. Schopný letu.
unit.corvus.description = Střílí masivní laserový paprsek, který poškozuje nepřátele a opravuje spojenecké struktury. Může překonat většinu z terénů.
unit.crawler.description = Běží směrem k nepřátelům, vybuchne a způsobí velkou explozi.
unit.atrax.description = Střílí oslabující koule strusky na pozemní cíle. Může překonat většinu z terénů.
unit.spiroct.description = Střílí mířené laserové paprsky na nepřátele, a zároveň se tím opravuje. Může překročit většinu terénu.
unit.arkyid.description = Střílí velké mířené laserové paprsky na nepřátele, a zároveň se tím opravuje. Může překročit většinu terénu.
unit.toxopid.description = Střílí na nepřátele velké energetické kazetové střely a lasery pronikající brněním. Může překročit většinu z terénů.
unit.flare.description = Střílí základní střely na okolní nepřátele.
unit.horizon.description = Pouští shluky bomb na pozemní cíle.
unit.zenith.description = Střílí salvy raket na všechny blízké nepřátele.
unit.antumbra.description = Střílí palbu střel na všechny blízké nepřátele.
unit.eclipse.description = Vystřelí dva pronikavé lasery a záplavu protivzdušných střel na všechny blízké nepřátele.
unit.mono.description = Samočinně těží měď a olovo a ukládá je do jádra.
unit.poly.description = Samočinně obnovuje zničené konstrukce a pomáhá ostatním jednotkám při stavbě.
unit.mega.description = Samočinně opravuje poškozené konstrukce. Je schopný přenést bloky a malé pozemní jednotky.
unit.quad.description = Pouští velké bomby na pozemní cíle, opravuje spojenecké konstrukce a poškozuje nepřátele. Je schopen přenést středně velké pozemní jednotky.
unit.oct.description = Chrání blízké spojence pomocí regeneračního štítu. Je schopen přenést většinu pozemních jednotek.
unit.risso.description = Střílí palbu raket a střel na všechny blízké nepřátele.
unit.minke.description = Střílí patrony a základní střely na blízké pozemní cíle.
unit.bryde.description = Střílí na nepřátele dělostřelecké granáty a rakety dlouhého doletu.
unit.sei.description = Střílí na nepřátele palbu raket a průbojných střel.
unit.omura.description = Střílí na nepřátele průrazné šrouby s dlouhým doletem. Vytváří jednotky Záře.
unit.alpha.description = Brání jádro Odštěpek před nepřáteli. Staví konstrukce.
unit.beta.description = Brání jádro Základ před nepřáteli. Staví konstrukce.
unit.gamma.description = Brání jádro Atom před nepřáteli. Staví konstrukce.

View File

@@ -1098,7 +1098,7 @@ block.item-void.name = Item Void
block.liquid-source.name = Liquid Source block.liquid-source.name = Liquid Source
block.liquid-void.name = Liquid Void block.liquid-void.name = Liquid Void
block.power-void.name = Power Void block.power-void.name = Power Void
block.power-source.name = Power Infinite block.power-source.name = Power Source
block.unloader.name = Unloader block.unloader.name = Unloader
block.vault.name = Vault block.vault.name = Vault
block.wave.name = Wave block.wave.name = Wave

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More