Compare commits

...

730 Commits
v140 ... v144.2

Author SHA1 Message Date
Anuken
520d122d82 arc 2023-05-21 20:42:34 -04:00
Anuken
7ab9c6fd9c Logic sprite upper limit now 64 2023-05-21 15:47:56 -04:00
Anuken
4d200276d2 Merge remote-tracking branch 'origin/master' 2023-05-21 15:24:30 -04:00
Anuken
c335722de5 Interplanetary accelerator hidden in database 2023-05-21 15:24:23 -04:00
WayZer
25b26be87b fixup! Fix Turret bug when cheat (#8273) (#8629) 2023-05-21 10:59:09 -04:00
Anuken
e714285671 pain 2023-05-21 04:46:50 -04:00
Anuken
dd3ce95264 fixed iOS crash 2023-05-21 04:42:23 -04:00
Anuken
564e81e734 Team#isEnemy is pointless 2023-05-21 03:59:08 -04:00
Anuken
dc63112915 Always hide content when isHidden() == true 2023-05-21 00:57:10 -04:00
Anuken
bc94e24874 Merge remote-tracking branch 'origin/master' 2023-05-20 10:40:39 -04:00
Anuken
94fe92d67d Pathfinder fixes / Hail resprite by Snake#2132 on Discord 2023-05-20 10:40:33 -04:00
MEEPofFaith
047d39d129 Chained PartProgress Operation in Json (#8627)
* Op parsing method

* Parse multi op

* Big brain

* Parse operation array

* Error wording

* Unnecessary code
2023-05-19 21:03:39 -04:00
MEEPofFaith
b6d27c16be Interval bullets for continuous bullets (#8628) 2023-05-19 21:02:54 -04:00
Anuken
7c52444e3c typo 2023-05-19 12:30:45 -04:00
Anuken
1f85d0d24f Load logger in iOS 2023-05-19 12:29:53 -04:00
Anuken
4a53a80b21 Removed redundant team checks 2023-05-19 11:12:32 -04:00
Anuken
cee09dd167 Merge remote-tracking branch 'origin/master' 2023-05-19 11:08:26 -04:00
Anuken
39227774e1 Ripple tint change / Minor optimization 2023-05-19 11:08:18 -04:00
MEEPofFaith
6cd778783e Shift swarmer shoot barrels to match the chutes (#8624)
Similar to how cyclone shoot barrels match the ends of each barrel.
2023-05-19 10:53:06 -04:00
Anuken
5db4c67477 Merge remote-tracking branch 'origin/master' 2023-05-19 00:01:43 -04:00
Anuken
0f87942b16 Fixed #8622 2023-05-19 00:01:36 -04:00
nullevoy
3dd7412ed8 swarmer resprite? (#8573)
* plastic

* swarm

* I did not forget I did not forget I did not forget I did not forget I did not for

* god I can never settle on anything hhhhhhhhhhhhhhhhhhhhhhhhhhhh

* Revert "god I can never settle on anything hhhhhhhhhhhhhhhhhhhhhhhhhhhh"

This reverts commit a59734eb04.

* eh why not

* Revert "eh why not"

This reverts commit c228dc5337.
2023-05-18 19:56:39 -04:00
Anuken
43d164d54b Map list fixes on phones 2023-05-18 12:21:45 -04:00
Anuken
d09695a946 Less MeshBuilder memory usage 2023-05-18 11:54:30 -04:00
Anuken
5976ed6983 Merge remote-tracking branch 'origin/master' 2023-05-18 11:04:04 -04:00
Anuken
d739269f59 Scatter resprite (By Daz from Discord) 2023-05-18 11:03:58 -04:00
Ilya246
72c28f7098 insanius (#8621) 2023-05-18 09:29:44 -04:00
Anuken
f2d83f3599 Vanilla base walls only 2023-05-18 00:45:18 -04:00
Anuken
b611e0f9f4 Tecta buff / Closes Anuken/Mindustry-Suggestions/issues/4427 2023-05-18 00:27:01 -04:00
Anuken
f59c439f2f Some more random schematics 2023-05-17 19:32:47 -04:00
Anuken
e6daf63a5a New base schematcs from Bluewolf 2023-05-17 19:03:16 -04:00
Anuken
00ae28847e New salvo sprite 2023-05-17 18:45:15 -04:00
Anuken
445e147c16 near is further 2023-05-17 09:38:15 -04:00
Anuken
410f4f69a1 near is nearer 2023-05-16 21:15:56 -04:00
Anuken
9e2251028b Merge remote-tracking branch 'origin/master' 2023-05-16 18:13:15 -04:00
Anuken
7f6907e14f More core units for bases 2023-05-16 18:13:09 -04:00
Github Actions
c6829c23d4 Automatic bundle update 2023-05-16 21:26:10 +00:00
Anuken
70293a4864 Merge remote-tracking branch 'origin/master' 2023-05-16 17:24:52 -04:00
Anuken
29855243cb Base building AI is back 2023-05-16 17:24:41 -04:00
Tentyanuk
16358dbd6a Update servers_v7.json (#8615)
Обновили комплектацию серверов
2023-05-16 09:35:12 -04:00
Anuken
83d28461f0 augh 2023-05-16 00:34:12 -04:00
Anuken
874cba7ad3 arc 2023-05-16 00:33:17 -04:00
Anuken
45baeb4933 Log zenity error 2023-05-16 00:16:46 -04:00
Anuken
8b35b44489 Made default CacheLayer add method insert before 'normal' 2023-05-15 22:54:10 -04:00
Anuken
1289e20990 Native (Zenity) file dialogs for Linux 2023-05-15 11:44:08 -04:00
Anuken
3593803ad9 Merge remote-tracking branch 'origin/master' 2023-05-15 10:26:40 -04:00
Anuken
0d89654103 Ignore null messages 2023-05-15 10:26:35 -04:00
GlennFolker
aa7ba6548c Move most planet rendering out of PlanetRenderer to Planet (#8608)
* Planet speaks for itself

* Ok fine keep old Gradle version

* Planet grid mesh builder

* Inline
2023-05-15 09:59:14 -04:00
Vojtak42
9b02d26856 Update bundle_cs.properties (#8610) 2023-05-15 08:54:07 -04:00
BeDanGames
30c773b304 Update servers_v7.json (#8611) 2023-05-15 08:53:54 -04:00
HamzaGSopp
738b96b94b Update servers_v7.json (#8606) 2023-05-14 16:50:20 -04:00
Anuken
151743021b Latest RoboVM 2023-05-13 18:22:01 -04:00
Anuken
dbbb27ec0f Merge remote-tracking branch 'origin/master' 2023-05-13 10:51:10 -04:00
Anuken
89e942ee35 Fixed #8602 2023-05-13 10:51:05 -04:00
BalaM314
5ec0e9dc9f Use shouldExplode, explosionMinWarmup in generators (#8600) 2023-05-13 09:53:47 -04:00
buthed010203
b40615d9e6 Fix crash (#8599) 2023-05-13 09:48:32 -04:00
Anuken
307943c098 Update SERVERLIST.md 2023-05-13 02:41:04 -04:00
Anuken
ebb40145ac Noise filter fix 2023-05-12 15:24:14 -04:00
Anuken
ae272f079b why was this here 2023-05-12 14:26:28 -04:00
Anuken
587c8c280c Better VariableReactorBuild explosion check 2023-05-12 12:16:32 -04:00
Anuken
7bcfaf54ef Fixed #8587 2023-05-12 12:10:37 -04:00
Anuken
bcee2e7083 Neoplasia reactor rebuildable 2023-05-12 02:34:02 -04:00
Anuken
ccf85b81c8 Fixed map list dialog 2023-05-12 02:23:03 -04:00
Anuken
126cca9e86 Gas sprite revert 2023-05-12 02:05:52 -04:00
MEEPofFaith
688b5b9eea Revert "Properly handle missile units shooting more missile units (#8359)" (#8585)
This reverts commit 1373381554.
2023-05-12 01:58:30 -04:00
WayZer
0496d2108c fix NPE in SpawnGroup.write (#8584)
* Update SpawnGroup.java

* Update contributors

* No Objects.isNull
2023-05-11 22:21:05 -04:00
Anuken
06e63dad45 Fixed #8582 2023-05-11 17:05:18 -04:00
Anuken
3b8f789955 Merge remote-tracking branch 'origin/master' 2023-05-11 15:24:45 -04:00
Anuken
be751f5b28 Minor cleanup 2023-05-11 15:24:41 -04:00
Github Actions
9a7f8bb573 Automatic bundle update 2023-05-11 17:42:50 +00:00
Anuken
d34631458e Mobile rebuild button support 2023-05-11 13:41:45 -04:00
Anuken
74f1688dd2 Merge remote-tracking branch 'origin/master' 2023-05-11 12:52:37 -04:00
Anuken
9745c2b7fd Better utilization of JoinDialog UI space 2023-05-11 12:52:32 -04:00
Phinner
bedd8f612a Update French translation (#8579)
* pull #7883

* add new translations

* add these fine gentlemen to the contributors

* bateau -> vaisseau

* forgor again 💀

* chore: Translate missing strings + Small changes

* chore: Apply suggested changes (author: Kalpas)
2023-05-11 12:04:14 -04:00
Anuken
38de095a2e Fixed map alignment 2023-05-11 11:59:45 -04:00
Anuken
8c56568f23 Reverted name change to un-break mods 2023-05-11 11:51:57 -04:00
Anuken
d14c42d8ba Disabled annoying X scrolling in map dialogs 2023-05-11 11:39:49 -04:00
Anuken
bed0bd135e Merge remote-tracking branch 'origin/master' 2023-05-11 11:24:47 -04:00
Anuken
b3e111ebbb Merged Custom/editor maps implementation 2023-05-11 11:24:42 -04:00
MEEPofFaith
2c77477987 PartMove progress is ignored for growth (#8580) 2023-05-11 01:06:49 -04:00
MEEPofFaith
397fd087f2 RegionPart movement should not be affected by growth scale (#8578) 2023-05-10 21:07:40 -04:00
Phinner
0919063ca3 Add BlockRotateEvent (#8577)
* feat: Add BuildRotateEvent

* fix: Fix invalid argument

* fix: Goofy aaah static imports

* chore: Update ConfigEvent doc + Add forgotten annotation

* chore: Remove final keyword

* fix: Remove rotation validation in Build#beginPlace

* Already covered by client snapshots

* fix: Remove useless imports
2023-05-10 21:03:08 -04:00
Anuken
51daa82a1b Fixed JSON sector preset files failing to load 2023-05-10 15:57:43 -04:00
Anuken
e60fff43bd Minor DrawPistons fix 2023-05-10 13:13:43 -04:00
MEEPofFaith
a5eda4fb2e Horizontal shifting of pistons (also adds proper icons for pistons) (#8345)
* Horizontal offset for pistons

* might as well fix icons in the meantime

* Make a positive offset shift to the right
2023-05-10 13:10:48 -04:00
Anuken
c7ad9d0250 Cleanup 2023-05-10 13:05:49 -04:00
Anuken
c5cf6f0af6 Cleanup 2023-05-10 13:00:49 -04:00
xStaBUx
a3dbbe63c4 Better planet selection (#8572)
* Better AboutDialog

* I'm there!

* New Planet Select UI

* fix

* Better Planet Selection

* no
2023-05-10 12:54:18 -04:00
MEEPofFaith
31bed37976 Ser-pew-lo Turret Animations (#8562)
* Scatter animations

* Do the same thing to salvo

Like, the exact same thing.

Corporate wants you to tell the difference between these two pictures.
They're the same picture.

* Faster salvo barrel recoil

* Move entire scatter midsection

* Cyclone barrel animations
2023-05-10 12:52:54 -04:00
Даркнесс#3729
4f845202f8 sendUnformatted method in PlayerComp (#8575) 2023-05-10 12:52:47 -04:00
Anuken
cac29c4ecc Placeable overlays 2023-05-10 12:48:41 -04:00
Anuken
0acb112f29 Allow placing floors (for mods) 2023-05-10 12:37:25 -04:00
Anuken
778e7d5f3f Merge remote-tracking branch 'origin/master' 2023-05-10 11:54:44 -04:00
Anuken
1b254745e9 bigger numbers 2023-05-10 11:54:39 -04:00
MEEPofFaith
1373381554 Properly handle missile units shooting more missile units (#8359)
* Properly handle missile units shooting more missile units

* Remove `shooter`, just pass down the owner
2023-05-09 20:34:13 -04:00
MEEPofFaith
2289f29bd5 Revert Math.max in shakeReduction (#8570) 2023-05-09 09:33:59 -04:00
MEEPofFaith
552d6a2e9f Smoother Screenshake Reduction (#8310)
* Smoother Screenshake Reduction

Screen shake will now always reach 0 no matter the intensity or duration without being cut off early.

* Keep the max reduction rate
2023-05-08 18:41:56 -04:00
MEEPofFaith
9aa45b2a7c Attempt healing targetting even if the bullet doesn't collide with ground targets (#8516) 2023-05-08 17:05:27 -04:00
Anuken
ccd2727ab5 Merge remote-tracking branch 'origin/master' 2023-05-08 12:15:06 -04:00
Anuken
820fd0d7fc Canvas block schematic preview 2023-05-08 12:15:00 -04:00
Anuken
a4972886a3 Possible parser status effect fix 2023-05-08 09:50:33 -04:00
HamzaGSopp
552353972e Update servers_v7.json (#8568) 2023-05-07 21:17:44 -04:00
Github Actions
db0691f32f Automatic bundle update 2023-05-07 16:33:03 +00:00
Mario A
a36e31c4b4 Fix some Italian translations (#8564)
Co-authored-by: Midblyte <midblyte@anonaddy.me>
2023-05-07 12:32:10 -04:00
JniTrRny
23f1d24c45 Search bar for wave UI (#8501)
* wave search + other editor things

* everything but wave search
2023-05-07 10:42:45 -04:00
Github Actions
2b5ff56460 Automatic bundle update 2023-05-07 13:39:11 +00:00
nullevoy
dbafdfb312 gas sprites (ark too ig) (#8528)
* ?

* this was better

* ghghghghgghghhghghghg

* single pixel changes
2023-05-07 09:38:17 -04:00
JniTrRny
bb06c3f1e9 Wave limit game rule in custom maps (#8550)
* custom maps wave limit

* whoopsies
2023-05-06 23:04:31 -04:00
Anuken
72c67f6c9b Merge remote-tracking branch 'origin/master' 2023-05-06 21:57:00 -04:00
Anuken
ea27fa53bf unitHealth in logic 2023-05-06 21:56:56 -04:00
Github Actions
8bbd58053a Automatic bundle update 2023-05-07 01:53:52 +00:00
Philipp
f1b52164c9 Fix some mistakes in German translation (#8543)
* Fix typo in German tutorial

* Fix some more
2023-05-06 21:53:10 -04:00
Prosta4okua
6cfcffd04e New translation (#8555)
* Update bundle_uk_UA.properties

Old

* Messaged

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

---------

Co-authored-by: SUS <94375206+1stvaliduser@users.noreply.github.com>
2023-05-06 21:52:52 -04:00
HamzaGSopp
ddd77b2081 Update servers_v7.json (#8556)
* Update servers_v7.json

chabge adresse of tamazia

* Update servers_v7.json

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2023-05-06 21:52:38 -04:00
Даркнесс#3729
f581aa3332 Update russian bundle (#8559)
* Update russian bundle

* Update bundle_ru.properties
2023-05-06 21:51:51 -04:00
Catchears
8126e970f3 update german translation (#8560)
* update german translation

* resolve @Shawak's comment
2023-05-06 21:51:37 -04:00
Slotterleet
52ec9f4296 A couple of features for better planet modding (#8558)
* Planet item whitelist

* allowLaunchToNumbered for planets

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

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

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2023-05-06 21:49:40 -04:00
MEEPofFaith
cc17962d93 Clear invalid payload ammo (#8544) 2023-05-06 21:34:11 -04:00
BalaM314
6c7d506e42 Gradle opt -PnoLocalArc to force no localArc (#8552)
renaming Arc is annoying, also vscode doesnt like it
2023-05-06 21:33:45 -04:00
BalaM314
c1d3cdc5cb Fix override of Building.block in PayloadSource (#8551)
* Would break(without crash) mods that read the block config of PayloadSource
2023-05-06 21:31:02 -04:00
Anuken
d85995f6fd Fixed #8557 2023-05-06 21:27:45 -04:00
Anuken
bc622bd7ba Doubled max schematic size 2023-05-06 11:11:57 -04:00
Anuken
027b996ad6 Fixed power node linking in basegen 2023-05-05 23:46:21 -04:00
Anuken
0bed338141 Fixed invalid ranges for some weapons 2023-05-05 23:40:05 -04:00
Anuken
43922edac8 unitHealthMultiplier re-implemented 2023-05-03 18:38:50 -04:00
Joan Josep
c4e1719c0c Update bundle_ca.properties (#8542) 2023-04-29 09:03:51 -04:00
Anuken
4deddc6def tests are no longer stupid 2023-04-28 15:37:38 -04:00
Anuken
6f88684040 and these other weapons too 2023-04-28 15:17:05 -04:00
Anuken
1a83d35923 Merge remote-tracking branch 'origin/master' 2023-04-28 14:39:34 -04:00
Anuken
5e8f5f1d62 PointDefenseWeapon no longer affects range 2023-04-28 14:39:28 -04:00
OSP
d610cd6105 [XCore] Mini Attack server + reserve server (#8530) 2023-04-28 10:55:11 -04:00
Anuken
681bd19866 Merge remote-tracking branch 'origin/master' 2023-04-28 10:48:21 -04:00
Anuken
8eed0f8711 Fixed #8533 2023-04-28 10:48:17 -04:00
MEEPofFaith
61a83d0f6e warmup and totalProgress for Pumps (#8536) 2023-04-28 10:42:31 -04:00
Github Actions
fc23ad9910 Automatic bundle update 2023-04-28 14:41:51 +00:00
JniTrRny
eba58c73e6 Update bundle_th.properties (#8532)
* 6 months of doing nothing

* Why am I up there

* More lore to the descriptions

* RIP original item description

* revenge of the item details

* new vocabulary just dropped

* cancel transliteration

sounds kinda lame, so might revert it later.
2023-04-28 10:40:32 -04:00
Tomoko
ba0335e5ef new ip (#8534)
* new ip

* Update servers_v7.json
2023-04-28 10:39:35 -04:00
Anuken
7de6bd23ea Fixed #8529 2023-04-28 10:29:47 -04:00
Anuken
102d234129 Merge remote-tracking branch 'origin/master' 2023-04-24 23:59:51 -04:00
Anuken
583a1c69b6 Logic pathfind instruction 2023-04-24 23:59:46 -04:00
MEEPofFaith
1314dfe53e Don't set lighting if the preset has noLighting = true (#8519)
* Don't set lighting if the preset has noLighting = true

Allows lighting in the preset or world processors to take over instead of being forced to disable lighting.

* Less confusing style
2023-04-21 21:56:16 -04:00
ienov
abc80b9aab update easyplay servers (#8521) 2023-04-21 21:32:46 -04:00
Богдан
2ab9783639 Removed non-license notice from the end (#8524) 2023-04-21 21:32:30 -04:00
Anuken
05f158fd51 Fixed #8523 2023-04-21 21:29:39 -04:00
Anuken
13297023fe Fixed #8525 2023-04-21 21:24:18 -04:00
Anuken
9cc392a9ed Merge remote-tracking branch 'origin/master' 2023-04-21 11:44:05 -04:00
Anuken
eb1d0b8362 Fixed minimap update lag 2023-04-21 11:44:00 -04:00
Anuken
7a01be6dba splashDamagePierce 2023-04-20 01:03:18 -04:00
MEEPofFaith
6a3b243937 Erekir payload conveyor sprite consistency (#8506)
* Erekir payload conveyor sprite consistency

* Better blending from conveyor to factory

* Better blending for the 5x5
2023-04-18 16:37:34 -04:00
lemon3357
68016cc2b5 Update server_v7.json:add new server (#8512) 2023-04-18 10:55:39 -04:00
MEEPofFaith
b2f5312bf5 Add overlays to render updates (#8514) 2023-04-18 10:14:07 -04:00
Anuken
6a3638c3c2 Fixed #8513 2023-04-18 10:10:11 -04:00
Anuken
3ca3eb5951 Load saves in parallel 2023-04-18 09:35:29 -04:00
Anuken
d043c75022 Merge remote-tracking branch 'origin/master' 2023-04-16 12:09:06 -04:00
Anuken
2db90408fe Use schematic/map names for filenames 2023-04-16 12:09:02 -04:00
lemon3357
72577f20ba Update servers_v7.json (#8508) 2023-04-15 22:27:24 -04:00
Anuken
f62096dbd1 Merge remote-tracking branch 'origin/master' 2023-04-15 22:24:45 -04:00
Anuken
dbfbb08aaa Fixed #8509 2023-04-15 22:24:40 -04:00
Brandons404
4151d47837 Update servers_v7.json - added sandbox server (#8504)
* added pvp server to fish

* updated servers_v7.json
2023-04-15 22:22:39 -04:00
Github Actions
c54a76fc8a Automatic bundle update 2023-04-16 02:21:40 +00:00
BotiHUN7
95483286bf vps changed ip (#8510) 2023-04-15 22:20:55 -04:00
Anuken
3d013fc09c Merge remote-tracking branch 'origin/master' 2023-04-15 22:17:51 -04:00
Anuken
b83f5c66ca Fixed #8507 2023-04-15 22:17:46 -04:00
MonoDx
288080eeac Rework (#8488)
* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties
2023-04-15 22:16:44 -04:00
Noah van der Aa
f0342b2396 Remove mindustry.party (#8511) 2023-04-15 22:12:30 -04:00
Anuken
e47806b9b8 Minimap attack indicators 2023-04-15 15:54:33 -04:00
Anuken
4ae8a51676 Display camera on map + right-click to pan 2023-04-15 14:39:41 -04:00
Anuken
e8fbfe536e Merge remote-tracking branch 'origin/master' 2023-04-09 18:16:30 -04:00
Anuken
b86ca1d12f Fixed #8496 2023-04-09 18:16:25 -04:00
MEEPofFaith
1629afe491 Ammo obliteration (#8498)
* alwaysShooting for turrets

similar to alwaysShooting for weapons

* Weapon alwaysShooting takes shootCone into account

Speaking of untested PRs...
2023-04-09 16:12:24 -04:00
L0615T1C5-216AC-9437
3b1e5eadd9 Update CN Ports (#8499) 2023-04-09 16:08:04 -04:00
Anuken
df87b03e57 Fixed #8495 2023-04-09 16:07:34 -04:00
Anuken
a8b18bea2f Fixed #8494 2023-04-09 16:01:35 -04:00
Anuken
cdf14bb381 Fixed objectives disappearing for no reason 2023-04-08 21:55:20 -04:00
Anuken
bce9ecc520 Merge remote-tracking branch 'origin/master' 2023-04-08 21:37:37 -04:00
Anuken
b692c071ba Fixed shoot pattern overrides not working in mods 2023-04-08 21:37:33 -04:00
Даркнесс#3729
db90142a2d New Darkdustry host (#8492) 2023-04-08 12:15:16 -04:00
Anuken
34b22f292c PR cleanup 2023-04-08 10:52:53 -04:00
Anuken
11ad5a0373 Reset UI scale to 100% when broken 2023-04-08 10:29:42 -04:00
Anuken
f4fabecce7 Fixed #8483 (meep why did you make the minimum 5%) 2023-04-07 11:05:26 -04:00
Anuken
60fc2fb5cd Doubled server object buffer size 2023-04-07 10:43:59 -04:00
Anuken
04eba618d2 Merge remote-tracking branch 'origin/master' 2023-04-06 19:13:41 -04:00
Anuken
ac7b694e91 Better item display rates 2023-04-06 19:13:36 -04:00
Github Actions
4fcb338d94 Automatic bundle update 2023-04-06 23:08:17 +00:00
JniTrRny
6dc3b7e729 More Dark UI in stats display (#8473)
* The Dark UI Menace

* Attack of the Dark UI
2023-04-06 19:07:24 -04:00
code-explorer786
cdb9fa0d7d Add PlayerChatEvent on clients (#8432)
* Add PlayerChatEvent on clients

d32dd01097

Co-authored-by: buthed010203 <naguiar010203@gmail.com>

* Only fire when valid. (Currently deciding on whether or not to add ChatEvent without the player.)

---------

Co-authored-by: buthed010203 <naguiar010203@gmail.com>
2023-04-06 18:16:04 -04:00
Anuken
2b11e1fb1e Fixed #8480 2023-04-06 12:15:12 -04:00
Anuken
697c6a927a Merge remote-tracking branch 'origin/master' 2023-04-06 10:46:57 -04:00
Anuken
72b456fca2 Optimized imports 2023-04-06 10:46:52 -04:00
Github Actions
f67e2c71e7 Automatic bundle update 2023-04-06 13:56:07 +00:00
Nunting
bee977cadc Update bundle_ko.properties (#8479) 2023-04-06 09:55:06 -04:00
MonoDx
183ebb33b7 Update bundle_be.properties (#8478)
Update logical translate.

Work monoDx.
Thanks
2023-04-06 09:54:48 -04:00
Anuken
f6665de2e6 Update push.yml 2023-04-05 20:06:45 -04:00
Anuken
97390d25c0 Removed pointless code 2023-04-05 19:51:16 -04:00
Anuken
3f1d957e28 New duo animation 2023-04-04 11:02:47 -04:00
Anuken
e62a5888ef Fixed some possible crashes 2023-04-03 16:40:12 -04:00
MEEPofFaith
6d71bcd2eb Multi shotgun fix (#8460)
* Multi-barrel shotgun fix

* multi-recoil support

* @Nullable for everything
2023-04-03 16:38:10 -04:00
buthed010203
2075a226e1 Fix multiline messages being cut off (#8471)
I'm not fixing this properly
2023-04-03 15:37:09 -04:00
MEEPofFaith
f55363a932 Fix janky sublimate ammo display (#8469) 2023-04-03 10:03:24 -04:00
DikHalz
76f151789a Update servers_v7.json (#8468) 2023-04-02 23:21:23 -04:00
Anuken
1413b479ef Classmap auto-update 2023-04-02 22:44:44 -04:00
MEEPofFaith
b322b1165f Parse singular consumes (#8466)
* Parse singular `Consume`s

* Proper coolant parsing

* Temporary manual update of ClassMap

Does not include all consume types.

I don't know what gradle command to run to update `ClassMap`. I've tried `tools:updateScripts` but that just cleared everything.
2023-04-02 19:53:19 -04:00
Anuken
fa02d8d280 Merge remote-tracking branch 'origin/master' 2023-04-02 13:28:53 -04:00
Anuken
251e10b000 Fixed #8465 2023-04-02 13:28:49 -04:00
Joan Josep
6630f88613 Update bundle_ca.properties (#8464) 2023-04-02 11:00:27 -04:00
Anuken
c5c65d4475 Fixed #8462 2023-04-02 10:54:42 -04:00
Anuken
c267743874 Fixed #8463 2023-04-02 10:38:19 -04:00
Anuken
45ce8c8dec Merge remote-tracking branch 'origin/master' 2023-04-02 10:36:31 -04:00
Anuken
25c65e80cd Fixed team write error 2023-04-02 10:36:26 -04:00
MEEPofFaith
e51ab514a8 Proper speedup amount (#8461) 2023-04-02 00:19:33 -04:00
Anuken
21d64157a0 Merge remote-tracking branch 'origin/master' 2023-04-01 17:30:08 -04:00
Anuken
fff8f567d0 Hide weapon sprites for certain units 2023-04-01 17:30:05 -04:00
Bernd Ritter
1e2e0a48a1 Update bundle_de.properties (#8452)
Fixed two typos of fordere -> vordere
2023-04-01 10:39:00 -04:00
Anuken
affa30730a Fixed #8458 2023-04-01 10:04:22 -04:00
Anuken
b326bdf0e8 Merge remote-tracking branch 'origin/master' 2023-04-01 09:55:59 -04:00
Anuken
cc3694ce4a battery fix 2023-04-01 09:55:54 -04:00
Xasmedy
3048e38bff Fixing menu not hiding on click. (#8455) 2023-04-01 09:54:01 -04:00
Anuken
b88a215dc5 Merge remote-tracking branch 'origin/master' 2023-03-31 23:05:00 -04:00
Anuken
36e5522694 JSON planet cloudMesh/HexSkyMesh support 2023-03-31 23:04:55 -04:00
Github Actions
226e8b8a20 Automatic bundle update 2023-04-01 02:45:47 +00:00
Anuken
43424547f2 Setprop description 2023-03-31 22:44:54 -04:00
Anuken
d2f2189441 Merge remote-tracking branch 'origin/master' 2023-03-31 22:03:02 -04:00
Anuken
e81cd5b68e Better impl of #8451 2023-03-31 22:02:57 -04:00
Xasmedy
c30cbc0f20 Update contributors (#8450) 2023-03-31 16:30:14 -04:00
Xasmedy
e79a97ed92 Adding a new menu type. (#8449)
* Added a new type of menu.

* Renamed the methods and fixed buttons not selecting.

* Fixed followUpMenu and menu having different dialogs.

* Applying review changes.
- Refactored the menu dialog instantiation.
- Fixed the single-line else statement.
2023-03-31 14:21:41 -04:00
MEEPofFaith
ac19c3f160 bridgeReplacement for ducts (#8447) 2023-03-30 21:23:53 -04:00
Phinner
375837eef5 Update Xpdustry servers (#8446)
* Update Xpdustry servers

* Add warning about SRV records

* Remove default port

* And now... Dik is gone too
2023-03-30 18:26:05 -04:00
Volas171
c59d3d5279 Update servers_v7.json (#8443) 2023-03-28 18:04:35 -04:00
Suportik-GFX
d1c506330b Update servers_v7.json (#8441)
adding one more server under the Exploding Cowards.
2023-03-28 14:04:07 -04:00
Anuken
b81e942479 Fixed RadialEffect + MultiEffect 2023-03-27 10:40:16 -04:00
Anuken
e36a70749c might as well blacklist it in the game too 2023-03-27 10:19:35 -04:00
Anuken
4db085bd07 Fixed #8435 2023-03-27 10:07:41 -04:00
Anuken
cd7088d241 Closes Anuken/Mindustry-Suggestions/issues/4353 2023-03-26 23:17:08 -04:00
Anuken
821569aafb Merge remote-tracking branch 'origin/master' 2023-03-26 22:46:35 -04:00
Anuken
83a059b2da Multi-line server list 2023-03-26 22:46:30 -04:00
MEEPofFaith
0de2c95f6e (Optionally) Scale efficiency of attribute crafters (#8433)
* Scale efficiency of attribute crafters

* Make it optional :D

* Call super
2023-03-26 14:53:14 -04:00
MEEPofFaith
fcb44e4952 Fix frags in frags creating a large empty space (#8430)
* Fix frags in frags creating a large empty space

* Change suppression message

Consistency with status duration

* Too little space between boxes
2023-03-26 11:53:46 -04:00
Github Actions
af26e60a4f Automatic bundle update 2023-03-26 02:45:57 +00:00
MEEPofFaith
6b936aa7f6 Better Ammo Stats Display (#8429)
* Cleaner ammo stats based on unit factory recipe stats

* Display suppression in bullet stats

Also reword from "regen" to "repair" to more accurately convey that build towers are affected as well.

* PointLaserBulletTypes don't display damage in dps

* Display preview region instead of region

* autoFixed
2023-03-25 22:45:07 -04:00
MEEPofFaith
f6a8c7509d Include int[] in readObject/writeObject (#8400)
* Include int[] in readObject/writeObject

* The almighty Object[]

* Order
2023-03-25 14:31:14 -04:00
Anuken
deb814ce58 Merge remote-tracking branch 'origin/master' 2023-03-25 14:26:50 -04:00
Anuken
da4371baf8 Removed pointless CRC check 2023-03-25 14:26:46 -04:00
MEEPofFaith
47a2afd294 More specific ui scaling options (#8356)
Increments of 5 instead of 25
2023-03-25 14:24:09 -04:00
MEEPofFaith
0122b735a0 Pierce damage decay (#8416) 2023-03-25 14:06:14 -04:00
MEEPofFaith
9c3ddc398c Battery Graphical Updates (#8323)
* Battery Graphical Updates

* Add the vanilla fields back

* Add back topRegion and depricate it
2023-03-25 14:00:08 -04:00
HamzaGSopp
0ccbe68a65 new server v7 (#8426)
new server Tamazia
2023-03-25 13:58:10 -04:00
Suportik-GFX
30cd6a7de6 Update servers_v7.json (#8421) 2023-03-25 13:57:50 -04:00
Brandons404
23a2596e29 added pvp server to fish (#8413) 2023-03-25 13:57:20 -04:00
TheRadioactiveBanana
b88422b17e Add eradication mindustry HexPvP && Hub server (#8380) 2023-03-25 13:57:11 -04:00
thedimas
09a9b68331 [thedimas] Use IP instead of domain (#8393) 2023-03-25 13:56:48 -04:00
BalaM314
08f63122ba Set controller after setting spawnedByCore (fix UnitChangeEvent) (#8428)
* CoreBlock.playerSpawn: Set spawnedByCore first
* The call to unit.controller() calls player.unit(unit)
* That function fires UnitChangeEvent
* The unit in UnitChangeEvent has spawnedByCore incorrectly set to false
* This caused me to waste an hour of my life while making a plugin

* Might as well improve code readability
2023-03-25 13:55:26 -04:00
phoskee
355f33b0a4 Update bundle_it.properties (#8411)
Fixed errors
Translated some sentences
2023-03-25 13:52:04 -04:00
MEEPofFaith
90f7bbae65 Make an interface for blocks that spawn tethered units (#8395) 2023-03-25 13:51:43 -04:00
Даркнесс#3729
4be7cf5c0e Call.textInput (#8355)
* Update Menus.java

* Update EventType.java

* Update UI.java

* WHY

* WHY x2

* fix

* 💀
2023-03-25 13:50:25 -04:00
Pasu4
58eef49284 Scale planet grid to planet radius (#8381)
* Scale planet grid to planet radius

* Fix skewed sector icons on small planets
2023-03-25 13:50:06 -04:00
MEEPofFaith
b030a51485 If it don't collide, don't collide (#8388) 2023-03-25 13:49:22 -04:00
MEEPofFaith
aec3e178f5 Fix armor piercing ignoring status effect health multiplier (#8387)
* Make rawDamage protected

* pierceArmor ignores status effect health multiplier

* This is no longer the case
2023-03-25 13:47:53 -04:00
gorodmi
ee47d8a20a Allow 0 items (#8389) 2023-03-25 13:46:55 -04:00
南门阳德
5c05c9f1d1 Fix memory leak in pools (#8415) 2023-03-25 13:46:11 -04:00
Anuken
172f47cad6 Fixed #8418 2023-03-25 13:36:45 -04:00
Anuken
a8b3350d61 Fixed #8401 2023-03-25 13:20:04 -04:00
Anuken
b324194295 Merge remote-tracking branch 'origin/master' 2023-03-25 13:16:15 -04:00
Anuken
663fa2bd3f Fixed #8399 2023-03-25 13:16:12 -04:00
SITUVNgcd
4ddb78e8d5 Add Events.fire(Trigger.unitCommandChange) in select/remove unit by type (#8406)
* Added `Events.fire(Trigger.unitCommandChange)` and `boolean fireInRebuildCommand`

Added `Events.fire(Trigger.unitCommandChange)` to **left click - select** and **right click - remove**.
Added `boolean fireInRebuildCommand` to prevent infinite event loop with `rebuildCommand`.

* Remove useless `fireInRebuildCommand` flag.
2023-03-25 13:10:21 -04:00
Anuken
f23d203095 Merge remote-tracking branch 'origin/master' 2023-03-25 13:01:16 -04:00
Anuken
dfce361afc Fixed #8423 2023-03-25 13:01:12 -04:00
Github Actions
2553891c25 Automatic bundle update 2023-03-25 16:43:28 +00:00
Anuken
e4bef567b5 Fixed Steam public lobby hosting / Misc Steam bugfixes 2023-03-25 12:42:29 -04:00
Anuken
0daafc5ff3 Steam kick bugfixes 2023-03-25 11:11:06 -04:00
Anuken
d07706e039 Pathfinder bugfixes 2023-03-18 16:18:16 -04:00
Anuken
ca2b51d4fe Merge remote-tracking branch 'origin/master' 2023-03-09 05:25:41 -05:00
Anuken
bae3884d96 Basic setProp implementation 2023-03-09 05:25:35 -05:00
MEEPofFaith
515a6f9c8d json-able attributes (#8334) 2023-03-08 13:11:53 -05:00
Joan Josep
d937af7497 Update bundle_ca.properties (#8341)
Missatge reforçat->Missatge destacat
Unir->Uneix (use imperative in buttons)
2023-03-08 09:25:56 -05:00
Github Actions
a216c9c56e Automatic bundle update 2023-03-08 14:21:36 +00:00
Ngọc Lam
0e9f250e93 Vietnamese translation for mindustry v7 update (Phase 1) (#7843)
* Update bundle_vi.properties

* Update bundle_vi.properties

* Alot of todo ...

* More...

* REEEEEEEE

* Alot of descriptions

* re-translate sectors desc

* fck VSC

* update sector descriptions

* Sector hints

* Block description

---------

Co-authored-by: Arckyn Nightingale <86044974+Kynarc@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2023-03-08 09:20:48 -05:00
MEEPofFaith
10e0be9d68 Drill multipliers for regular drills and beam drills (#8339)
* Drill multipliers for other drills

* h
2023-03-08 09:19:57 -05:00
Github Actions
29d4246019 Automatic bundle update 2023-03-08 14:19:41 +00:00
OSP
65c5d206a8 [XCore] new server (#8372) 2023-03-08 09:18:46 -05:00
MonoDx
3a73a97746 Update bundle_be.properties. (#8374)
Worked Dima Pozniac and monodx.

Thanks.
2023-03-08 09:18:17 -05:00
MEEPofFaith
a3f8ca9ca5 Shield flash on top (#8373)
Co-authored-by: Anuken <arnukren@gmail.com>
2023-03-08 09:17:39 -05:00
MEEPofFaith
a046f0f11b Non-hexagonal force projectors (#8358) 2023-03-08 09:16:07 -05:00
Github Actions
2cc486febc Automatic bundle update 2023-03-08 14:11:55 +00:00
MEEPofFaith
3c9b3680bc Interval Bullet Delay (#8365)
Like homing delay
2023-03-08 09:11:07 -05:00
MEEPofFaith
0a1957eb13 Display Interval Bullet in Stats + Collapsers (#8366)
* Display interval bullets in stats

* Collapsers for sub-bullets

* highlight /sec as well

* top
2023-03-08 09:10:34 -05:00
MEEPofFaith
75e1e6f166 Player unit spawns before core animation finishes (#8375)
* Player unit spawns before core animation finishes

* the

* Shouldn't the landing particles also be aimed at the tile's world pos?
2023-03-08 08:26:11 -05:00
Sunky.MPEG
327a8fc61b Clearer translations (#8364)
* Clearer translations

* Small changes
2023-03-08 07:12:04 -05:00
Anuken
a857eaed74 Fixed #8368 2023-03-08 07:06:59 -05:00
Anuken
028c189dc8 Merge remote-tracking branch 'origin/master' 2023-03-08 06:56:49 -05:00
Anuken
11f8e06708 Fixed #8340 / Reverted #8220 2023-03-08 06:56:44 -05:00
MEEPofFaith
0760923943 overRegion (#8337) 2023-02-27 11:26:47 -05:00
MEEPofFaith
219084fe3c Don't generate edges if edges already exist (#8338) 2023-02-27 11:26:26 -05:00
Evgenij
4f314afe21 [RU] Small translation update (#8342)
* [RU] Small translation update

* Update bundle_ru.properties
2023-02-27 11:25:29 -05:00
OGalaxy
6750cfead8 Update servers_v7.json (#8349)
* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
2023-02-27 11:25:12 -05:00
Anuken
b569646310 fixed ignoreLiquidFullness 2023-02-26 23:03:03 -05:00
Anuken
cc207d3d7c a 2023-02-26 15:36:28 -05:00
Anuken
e234ac43a6 Fixed keybind names 2023-02-25 11:38:18 -05:00
Anuken
2388091ed6 Merge remote-tracking branch 'origin/master' 2023-02-23 16:12:57 -05:00
Anuken
a38351d41f isLogicControllable 2023-02-23 16:12:52 -05:00
Tentyanuk
4d8de72a8e Update servers_v7.json (#8332) 2023-02-23 09:06:07 -05:00
Github Actions
ab2138d8e7 Automatic bundle update 2023-02-22 18:03:15 +00:00
MonoDx
46c75af9e4 Updated and improved belarusian translation. (#8331)
Edited by monodx.
2023-02-22 13:02:09 -05:00
Gureumi
8eb3c16c50 Fix server always paused (#8330) 2023-02-22 13:02:04 -05:00
Anuken
39e88ae614 Fixed #8328 2023-02-21 18:15:20 -05:00
Anuken
4410f31888 Merge remote-tracking branch 'origin/master' 2023-02-21 10:55:01 -05:00
Anuken
df11dd7a74 Fixed issues with #7972 2023-02-21 10:54:56 -05:00
MonoDx
804dd61cd9 Updated belarusian translate. (#8327)
Edited by monodx.
2023-02-21 10:26:04 -05:00
Anuken
b00c5b4cab Merge remote-tracking branch 'origin/master' 2023-02-21 10:24:50 -05:00
Anuken
e0d6cebb2e Fixed #8326 2023-02-21 10:24:45 -05:00
ulwepo
ab772dccd4 Update bundle_ja.properties (#8324) 2023-02-21 09:55:55 -05:00
BotiHUN7
b244032328 Update servers_v7.json (#8320) 2023-02-21 09:55:33 -05:00
DikHalz
421c5e2879 Update servers_v7.json (#8325)
HUB

Co-authored-by: ColaHz <87813567+ColaHz@users.noreply.github.com>
2023-02-21 09:52:55 -05:00
Anuken
1a8c4d8d8a Update deployment.yml 2023-02-20 14:19:36 -05:00
Tomoko
9efb1824af Update servers_v7.json (#8322) 2023-02-20 13:46:01 -05:00
Anuken
74de125700 githubImportMod old signature returned 2023-02-20 12:27:24 -05:00
Anuken
64cea34a98 Merge remote-tracking branch 'origin/master' 2023-02-20 12:20:01 -05:00
Anuken
9c4bdc213d Crash fix 2023-02-20 12:19:56 -05:00
Fischer1000
92c0552fd5 Update hungarian language file (#8315)
Fine tune the file. I have made it to it's quarter today (line 537).
2023-02-19 09:26:59 -05:00
OSP
ff39e5f90d [XCore] Change ip (#8319) 2023-02-19 09:25:09 -05:00
Anuken
83c55fdbb4 Merge remote-tracking branch 'origin/master' 2023-02-18 23:12:52 -05:00
Anuken
7d300a273b added missing break 2023-02-18 23:12:47 -05:00
MEEPofFaith
29f36c1927 ClientServerConnectEvent (#8309) 2023-02-18 19:48:22 -05:00
ferrandusqui31
b65c3cd931 Missing translation and errors correction (#8312)
On line 104 updated joingame from "Uneix-me a una partida" to "Unir-se a una partida".
On line 494 update editor.savemap from "Desa un mapa" to "Desa el mapa".
On line 1386 updated block.kiln.name from "Kiln" to "Forn de vidre".
On line 1468 updated block.reinforced.message  from "Missatge remarcat" to "Missatge reforçat".
2023-02-18 19:48:08 -05:00
Anuken
7401e7fe31 Fixed #8316 2023-02-18 19:47:22 -05:00
Anuken
150215712b formatting 2023-02-17 09:18:08 -05:00
Gureumi
f7ccf3c04a Add window size parameter (#8281)
* Add window size parameter

* Formatting

* Java 8
2023-02-17 09:13:59 -05:00
Evgenij
ebb798cac3 Update servers_v7.json (#8307) 2023-02-17 09:03:44 -05:00
MEEPofFaith
348819d1ac connectedPower similar to conductivePower (#8306) 2023-02-15 23:22:05 -05:00
MEEPofFaith
a8a3453632 Move core launch/landing to CoreBlock (#8055)
* Move core launch/landing to CoreBlock

* Slight cleanup

* just gonna...
2023-02-15 12:16:51 -05:00
FunnyCat
9b02a274f1 Update servers_v7.json (#8293)
Explosive corp deleted
2023-02-15 10:38:44 -05:00
Anuken
f093360565 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-15 10:34:57 -05:00
Anuken
d457901d2e Minor Conquer buff 2023-02-15 10:34:52 -05:00
Anuken
460dbff7d1 Fixed shield break effect 2023-02-15 10:33:36 -05:00
Anuken
e564602fd1 Hide isHidden content in mod info 2023-02-15 09:59:32 -05:00
Baldur404
e029321e5b Update servers_v7.json (#8290)
Co-authored-by: Anuken <arnukren@gmail.com>
2023-02-15 09:34:38 -05:00
Tentyanuk
87d7089df3 Update servers_v7.json (#8294)
DNS doesn't work for everyone
2023-02-15 09:02:46 -05:00
WayZer
e4f929a851 Fix turret when cheating (#8291)
* (C/S) Fix ItemTurret ammo when `cheat`.

* (C/S) Fix `TurretBuild.updateReload` NPE when `cheat`

* Why `shouldConsume` cause `potentialEfficiency=0`
2023-02-15 09:02:32 -05:00
MEEPofFaith
8726cde05d Return salvo and swarmer to how they were before shoot changes (#8278) 2023-02-15 09:01:03 -05:00
Bill Arndt
a189ac8613 Update Team.java to increase dynamic range of team colors (#8279)
I'm having a lot of trouble finding enough visually distinct team colors; In the worst case I need about 25 colors. I am manually excluded colliding team numbers I know about, but, I can only find about 14 easily distinguishable colors before everything is another bright magenta, or yellow, or cyan, or pale green.
2023-02-15 09:00:34 -05:00
ulwepo
652aa4c456 Update bundle_ja.properties (#8300) 2023-02-15 09:00:10 -05:00
MEEPofFaith
cc3ae2c66c Use setBars instead of overriding displayBars (#8296) 2023-02-15 08:59:57 -05:00
Даркнесс#3729
359e59bbad Changed Darkdustry domain to direct IP address (#8292)
Why? Because darkdustry.net is not available in some countries (Ukraine, Israel and some more)
Also improved formatting
2023-02-15 08:58:09 -05:00
Anuken
40ec7fd6fc Less Core.app.post for build events 2023-02-15 08:57:06 -05:00
Anuken
d17f0ebc51 Fixed #8297 2023-02-15 08:35:53 -05:00
Anuken
5027b70f5a Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-14 15:08:27 -05:00
Anuken
0b7c790777 turret status fix 2023-02-14 15:08:24 -05:00
Github Actions
5ac9e9f63c Automatic bundle update 2023-02-13 19:13:48 +00:00
Anuken
b08136e3ea Quell no longer targets flying units 2023-02-13 14:12:53 -05:00
Anuken
ec8262418f Basic unit boost command support 2023-02-11 17:40:57 -05:00
Anuken
946e36c66e Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-09 17:50:46 -05:00
Anuken
00f3518349 Fixed #8277 2023-02-09 17:50:43 -05:00
Volas171
29bf99fe1a Update servers_v7.json (#8276) 2023-02-09 17:43:11 -05:00
Tentyanuk
e104591dec Update servers_v7.json (#8271)
**SRV proved to be really too inefficient and unprofitable!!**

1. Huge delays
2. These records do not work for everyone
2023-02-09 09:22:58 -05:00
Gureumi
0fd26e68d4 Fix server auto pause when gameover (#8220)
* Fix server auto pause when gameover

* Update ServerControl.java

* Update ServerControl.java
2023-02-09 09:21:55 -05:00
WayZer
53f410fee0 Fix Turret bug when cheat (#8273)
* (C/S) Fix ItemTurret ammo when `cheat`.

* (C/S) Fix `TurretBuild.updateReload` NPE when `cheat`
2023-02-09 09:20:06 -05:00
FunnyCat
53206e4b31 Update servers_v7.json (#8256)
Explosive hub deleted
2023-02-08 22:54:45 -05:00
Tentyanuk
3818bfffb4 Update servers_v7.json (#8260)
We added DNS v4/v6 with proxy, updated addresses and moved our servers to a more productive host

*P.S Sorry for creating pull requests before this, I was too stupid to realize that this pull request is directed to the order of ping requests, and not to the order of servers in general..*
2023-02-08 22:54:17 -05:00
Phinner
e6afc6ef0b Add info section about SRV records in SERVERLIST.md (#8252)
* update SERVERLIST.md

* aslo setup 💀
2023-02-08 22:51:25 -05:00
Gureumi
5eb1c1dffc Remove dead servers v6 (#8262) 2023-02-08 22:50:21 -05:00
Github Actions
66406806b7 Automatic bundle update 2023-02-09 03:49:19 +00:00
Anuken
3a6debfae6 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-08 22:48:33 -05:00
Anuken
a093fa5718 Replaced #8035 2023-02-08 22:48:17 -05:00
Даркнесс#3729
9c1f17fbdd Add pvpAutoPause rule (#8249)
* Update Rules.java

* Update NetServer.java
2023-02-08 22:44:07 -05:00
MEEPofFaith
ce3643f0b3 Make type not required if the template already provides one (#8257)
Such as with missile units
2023-02-08 22:35:13 -05:00
MEEPofFaith
f1fb7d8098 Fix modded payload conveyor icons (#8266) 2023-02-08 22:28:44 -05:00
Anuken
3d01eeaf1c Fixed #8251 2023-02-08 22:25:10 -05:00
Github Actions
be39c31865 Automatic bundle update 2023-02-01 20:22:46 +00:00
Phinner
0d2dfadba7 Mod dependency resolution improvements (#7972)
* soft dependencies + better mod resolution algorithm

* update ModMeta#toString

* var

* add #7962 bugfix

* Use existing code to resolve

* add state text for mod dialog

* bugfix

* fix error text

* remove external resolver class

It's simpler like that :)
2023-02-01 15:21:42 -05:00
Anuken
2dcab97b6d Merge remote-tracking branch 'origin/master' 2023-02-01 15:20:38 -05:00
Anuken
31cb169002 Random server order 2023-02-01 15:20:34 -05:00
LeTuanVN
c381499c58 Update vi translation (#8225)
* Update bundle_vi.properties

* Update bundle_vi.properties
2023-02-01 14:57:09 -05:00
KotMilkMeoWtwo
8577a8cca4 Update servers_v7.json (#8234)
nya
2023-02-01 14:55:52 -05:00
Tentyanuk
7a18c4a580 Update servers_v7.json (#8238) 2023-02-01 14:55:39 -05:00
TheRadioactiveBanana
40589eb9ff Added nuclear pvp server (#8222)
i somehow forgot to press propose changes doing this yesterday, so i do this again today
2023-02-01 14:51:47 -05:00
ulwepo
722370b57c Update servers_v7.json (#8214) 2023-02-01 14:51:36 -05:00
FunnyCat
573672622a Update servers_v7.json (#8215) 2023-02-01 14:48:26 -05:00
MEEPofFaith
12f747ae1d Strip colors from mod name as well (#8224) 2023-02-01 14:45:56 -05:00
WayZer
395dc99595 Update servers_v7.json (#8240) 2023-02-01 14:45:28 -05:00
Даркнесс#3729
c945243795 It doesn't work (#8237) 2023-02-01 14:45:00 -05:00
Anuken
c2262cc9cf Fixed #8235 / Fixed #8221 2023-02-01 14:42:50 -05:00
Anuken
411399e96f Fixed #8211 2023-02-01 14:18:29 -05:00
Anuken
f833b9e0ce Fixed #8236 2023-02-01 14:09:16 -05:00
Anuken
9955423e9a Merge remote-tracking branch 'origin/master' 2023-02-01 13:35:11 -05:00
Anuken
58b4265b31 Fixed #8232 2023-02-01 13:35:06 -05:00
Epowerj
671a62aed7 Merge pull request #8242 from osp54/patch-2
[XCore] Hexed server
2023-02-01 13:09:46 -05:00
OSP
c94fe9c312 [XCore] Hexed server 2023-01-31 21:07:30 +02:00
Tentyanuk
f46a9730a3 Update SERVERLIST.md (#8205) 2023-01-22 11:03:59 -05:00
Tentyanuk
d45cd7c15e Banned logic displays on sandbox (#8204) 2023-01-22 09:54:39 -05:00
Anuken
a84d52f5fe Removed Omnidustry sandbox due to moderation issues (#8203) 2023-01-22 09:26:09 -05:00
Anuken
330d37b7a5 Merge remote-tracking branch 'origin/master' 2023-01-22 08:59:36 -05:00
Anuken
d2792a4e9d Fixed #8202 2023-01-22 08:59:32 -05:00
Kotamus
c50a69d42a Update servers_v7.json (#8201)
Crawler arena
2023-01-21 09:40:26 -05:00
Anuken
ee689d1597 Merge remote-tracking branch 'origin/master' 2023-01-20 09:37:33 -05:00
Anuken
6ef8d64d46 Efficiency fix 2023-01-20 09:37:28 -05:00
eSK8er
0095e89673 Update servers_v7.json (#8145) 2023-01-19 00:34:13 -05:00
SachaTending
55d97ea202 add tendhost(not running) [reopened] (#8147) 2023-01-18 11:49:22 -05:00
Anuken
85b8868d2b Fixed #8194 2023-01-18 10:41:39 -05:00
Anuken
65e92ab6fc Merge remote-tracking branch 'origin/master' 2023-01-17 18:50:49 -05:00
Anuken
478baf2532 Fixed #8192 2023-01-17 18:50:44 -05:00
Joan Josep
0750348cb1 Update bundle_ca.properties (#8190) 2023-01-17 18:49:20 -05:00
UnCaughT
db6cbc5cc3 Update servers_v7.json (#8189)
HexPvP IP Change
2023-01-17 00:18:09 -05:00
Anuken
b4359c0489 Merge remote-tracking branch 'origin/master' 2023-01-16 15:28:45 -05:00
Anuken
977192bc54 Fixed #8187 2023-01-16 15:28:40 -05:00
南门阳德
d54b557a9f Revert #8176 (#8186)
Liquid turrets are used to give buff like wet but not do the damage. The ammo change is not appropriate.
2023-01-16 11:07:00 -05:00
Anuken
f6c97f4ff6 Fixed #8185 2023-01-16 11:06:34 -05:00
Anuken
66f4118896 Fixed #8184 2023-01-15 15:19:13 -05:00
Anuken
4a8f8c4ecf Merge remote-tracking branch 'origin/master' 2023-01-15 08:51:57 -05:00
Anuken
6d7c207b95 Fixed drawing of assembler payloads 2023-01-15 08:51:51 -05:00
DinnerWool
597bd31a0c Update servers_v7.json (#8183) 2023-01-15 08:42:59 -05:00
Knochi
98157f2852 Never use „tun“ in German language (#8179) 2023-01-14 14:41:14 -05:00
MEEPofFaith
5e324e71d4 Hitscan fix 2 (#8175)
* Revert "Reverting #8037"

Re-implement #8037

* Properly count collisions

Fix #8170
2023-01-14 10:05:30 -05:00
Anuken
3159ce6707 Merge remote-tracking branch 'origin/master' 2023-01-13 19:34:52 -05:00
Anuken
9b033532c8 Fixed #8177 2023-01-13 19:34:48 -05:00
Даркнесс#3729
0678592d59 Fix cheaty item and liquid turrets (#8176)
* Update Turret.java

* Update TractorBeamTurret.java

* Update TractorBeamTurret.java

* Update ItemTurret.java

* Update LiquidTurret.java
2023-01-13 16:51:36 -05:00
Anuken
00d6b0d483 Merge remote-tracking branch 'origin/master' 2023-01-13 09:59:05 -05:00
Anuken
598049265a Complete revert of #8019 2023-01-13 09:59:01 -05:00
Nunting
c3209f2cdd Update bundle_ko.properties (#8171) 2023-01-13 09:44:08 -05:00
Anuken
b2b4602c91 Reverting #8037 2023-01-13 09:42:28 -05:00
Anuken
b1e1fe4922 Merge remote-tracking branch 'origin/master' 2023-01-13 09:31:14 -05:00
Anuken
edcf3c4223 Fixed #8170 2023-01-13 09:31:10 -05:00
Github Actions
58315acfa3 Automatic bundle update 2023-01-13 03:53:33 +00:00
Anuken
ec9eadd660 encoding test 2023-01-12 22:52:32 -05:00
Anuken
7277892e33 Merge remote-tracking branch 'origin/master' 2023-01-12 17:01:52 -05:00
Anuken
54962a158d Fixed #8168 2023-01-12 17:01:47 -05:00
Даркнесс#3729
30dcbe1af3 Administration improvements (#8167)
* Administration improvements

Reduced the interval for preventing sending the same message because 50 seconds is too much and kinda confusing
Added saving and loading kicked IPs so they are saved even when the server crashes
Fixed smth in Config

* skill issue
2023-01-12 16:24:51 -05:00
Anuken
e92d5d2d2d Fixed #8165 2023-01-12 14:42:42 -05:00
Anuken
411367f294 Revert JSON rules change 2023-01-12 14:38:11 -05:00
Anuken
f49e05a915 Fixed #8161 / Fixed #8162 2023-01-12 14:30:57 -05:00
Anuken
53e8eaae75 Further scathe uncover range nerf 2023-01-12 11:36:13 -05:00
Anuken
85077fbb9c Force canGameOver in campaign 2023-01-12 11:32:57 -05:00
Anuken
f070d8c965 Merge remote-tracking branch 'origin/master' 2023-01-12 09:35:52 -05:00
Anuken
0dc2dc9b08 Fixed crash with modded unit classes 2023-01-12 09:35:48 -05:00
Даркнесс#3729
80afe5ad86 Fixed russian translate (#8045)
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
2023-01-12 08:51:28 -05:00
Anuken
3287479ee3 Damage object pooling 2023-01-12 08:50:19 -05:00
Anuken
b308b3eaa4 Merge remote-tracking branch 'origin/master' 2023-01-12 08:36:52 -05:00
Anuken
b734fb948d Fixed #8159 2023-01-12 08:36:47 -05:00
OSP
117399f10a XCore server (#8158) 2023-01-11 20:01:44 -05:00
Anuken
9c63165ef5 Fixed #8156 2023-01-11 19:59:58 -05:00
Anuken
5e084be6f5 Merge remote-tracking branch 'origin/master' 2023-01-11 09:23:29 -05:00
Anuken
5a2c987ea6 Fixed #8153 2023-01-11 09:23:22 -05:00
MEEPofFaith
6eeb49bb37 Fix armor piercing not working against buildings (#8150) 2023-01-11 09:06:44 -05:00
Github Actions
b2bb6136de Automatic bundle update 2023-01-11 13:57:16 +00:00
MEEPofFaith
87949679f1 Make crash damage a multiplier instead of a toggle (#8151)
* Switch unitCrashDamage to a multiplier

* Add to rules dialog
2023-01-11 08:56:29 -05:00
Anuken
a9175d3ffe + 2023-01-10 21:26:57 -05:00
Anuken
79ea2480cb unitCrashDamage rule 2023-01-10 21:25:23 -05:00
MEEPofFaith
7455fb21a4 Proper trails for point lasers (#8038)
* Proper trails for point lasers

* Take current size into account

* fh9weqfjpoepiofjwpiqoefjpoiwjieqpofpjioji

* Web editing moment

* Point laser bullets shouldn't have aa shoot effect

* h
2023-01-10 12:11:37 -05:00
Anuken
2c3210afce Merge remote-tracking branch 'origin/master' 2023-01-10 11:59:36 -05:00
Anuken
ea9ba60d66 Minor unit balance changes 2023-01-10 11:59:31 -05:00
Explosive corp
130ad59fc4 Update servers_v7.json (#8146)
Explosive hub and pvp
2023-01-10 08:45:57 -05:00
Anuken
1417e94bcd Merge remote-tracking branch 'origin/master' 2023-01-09 22:17:27 -05:00
Anuken
3ec2ae797e Ship beryllium cost increase / Scathe discover range nerf 2023-01-09 22:17:20 -05:00
Valeriy
222499d4c6 Thanks Anton! (#8142)
thats a very stupid mistake
2023-01-09 22:11:32 -05:00
MEEPofFaith
2a6fcb7983 Region part growing (#7861)
E x p a n d
2023-01-09 22:08:40 -05:00
TNT331
05221a8043 Add v7 Serv (#8139) 2023-01-09 21:11:25 -05:00
kotasusmogus
50b4915ff9 Update servers_v7.json (#8138)
I created survival server
2023-01-09 21:11:15 -05:00
kotasusmogus
2ef708a586 Update servers_v7.json (#8135)
I want to add a server
2023-01-09 12:49:20 -05:00
Github Actions
8212c54446 Automatic bundle update 2023-01-09 17:48:55 +00:00
Romanin
503254bc1a Update servers_v7.json (#8137) 2023-01-09 12:48:03 -05:00
Prosta4okua
c1b0b22e4c Ukr translation v7 (#8134)
* hehe

* Finished translation. Need to proofread. Added 2 missing entries.

* Fixes

* Fixes #2

* Added button Random to translations and fixed error

* Fixes from @1stvaliduser

* fixes

* fixes

* виправлення

* Update bundle_uk_UA.properties
2023-01-08 22:55:07 -05:00
Volas171
96f5c0a03a Update servers_v7.json (#8133) 2023-01-08 22:54:29 -05:00
Anuken
cba1e81f3d More consistent status flash 2023-01-08 14:40:47 -05:00
Anuken
dcc6e9827d Status flash tweaks 2023-01-08 12:29:29 -05:00
Anuken
e27f7c8332 Fixed #8131 2023-01-08 10:24:55 -05:00
Anuken
40aebf0e77 Merge remote-tracking branch 'origin/master' 2023-01-08 10:19:52 -05:00
Anuken
dcf9aa9793 Fixed #8132 2023-01-08 10:19:47 -05:00
Github Actions
45591fab83 Automatic bundle update 2023-01-08 06:24:54 +00:00
Anuken
658ebf4bc5 Merged #8053 2023-01-08 01:23:54 -05:00
Joan Josep
59c2a11824 Update bundle_ca.properties (#7947) 2023-01-08 01:22:32 -05:00
Github Actions
33a57b11f6 Automatic bundle update 2023-01-08 05:18:51 +00:00
Anuken
d082963167 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/assets/bundles/bundle_es.properties
2023-01-08 00:17:52 -05:00
Anuken
e2fa834079 Merge of #7987 2023-01-08 00:16:58 -05:00
Khanx
e6bfc1cee8 Updated spanish translation (#7928) 2023-01-08 00:15:55 -05:00
Somka000
5b35319559 Add server to list (#8009)
Co-authored-by: Anuken <arnukren@gmail.com>
2023-01-07 23:42:28 -05:00
Somka000
36513c709d Add server to list (#8009)
Co-authored-by: Anuken <arnukren@gmail.com>
2023-01-07 23:42:16 -05:00
Volas171
13bca1b7bd Update servers_v7.json (#8074)
* Update servers_v7.json

* little space
2023-01-07 23:41:28 -05:00
MWestfall
b9c85fcaf2 Update servers_v7.json (#7989)
Add ECAN to v7
2023-01-07 23:40:42 -05:00
MWestfall
50cc281e24 Update servers_v6.json (#7990)
Remove ECAN from v6
2023-01-07 23:38:26 -05:00
Miniontoby
0211732520 Fixed sand-floor translation in Dutch (#8058)
Changed from 'Donker Zand' which means 'dark sand' to 'Zand' which is just 'sand'
2023-01-07 23:38:12 -05:00
adamlolgaming
33f6004c81 Update bundle_pl.properties (#8057) 2023-01-07 23:34:18 -05:00
xem8k5
23d3c2dfe7 Update servers_v7.json (#8129) 2023-01-07 22:58:42 -05:00
Mr.S
7cce9fad55 Update servers_v7.json (#8128)
Server upgrade to V7
2023-01-07 21:44:56 -05:00
Anuken
2c2d561ea6 Merge remote-tracking branch 'origin/master' 2023-01-07 19:34:40 -05:00
Anuken
62e33effd1 CargoAI target clearing 2023-01-07 19:34:36 -05:00
Mr.S
85229f15c4 Update servers_v6.json (#8082)
Server upgrade to V7

Co-authored-by: Anuken <arnukren@gmail.com>
2023-01-07 18:49:20 -05:00
OGalaxy
2f0de58d00 Update servers_v7.json (#8118) 2023-01-07 18:40:41 -05:00
VaporSpace2
6ef21f65b2 updates to GMS server network (#8059)
adding the new "Generic PvP server" to v7 server list, renamed server network to "generic mindustry"
2023-01-07 16:22:55 -05:00
Anuken
be8fec55e1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-01-07 16:22:06 -05:00
Anuken
76430c1e68 a 2023-01-07 16:21:03 -05:00
BeDanGames
a4b1d2ca51 Update servers_v7.json (#8127) 2023-01-07 16:20:18 -05:00
Valeriy
51b93205ff SMoA come back (#8064)
* SMoA come back

* leave from v6

* Fix
2023-01-07 16:16:34 -05:00
Garen7
832b5e62bf Fixes typo on Payload Mass Drivers (#8090)
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2023-01-07 16:14:04 -05:00
ColaHz
c78adb12aa add new server, servers_v7,json (#8106)
* add new server, servers_v7,json

* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json

Co-authored-by: DHz06 <87813567+DHz06@users.noreply.github.com>
2023-01-07 15:30:51 -05:00
Xasmedy
019ffe4c5c Added the mindustry.ddns.net HUB. (#7911) 2023-01-07 15:29:51 -05:00
L0615T1C5-216AC-9437
b3d014cd9f Add more ports to cn (#8003)
* Add more ports to cn

* Update servers_v7.json
2023-01-07 15:20:26 -05:00
L0615T1C5-216AC-9437
bebc8f0342 Remove ports from cn (#8002) 2023-01-07 15:20:11 -05:00
Anuken
56ed932716 Merge remote-tracking branch 'origin/master' 2023-01-07 15:07:57 -05:00
Anuken
4c09f6dd40 Fixed #8025 2023-01-07 15:07:54 -05:00
Phinner
700e4564a8 Update Xpdustry V7 servers (#7977)
* update servers

* more...

* Add lobby server
2023-01-07 14:54:34 -05:00
Anuken
f1e1eb1015 Fixed #8015 2023-01-07 14:54:15 -05:00
Anuken
963b96a1fb Merge remote-tracking branch 'origin/master' 2023-01-07 14:47:14 -05:00
Anuken
87786441ff Fixed #8117 2023-01-07 14:47:10 -05:00
Anuken
05dec4df6a Fixed #8117 2023-01-07 14:46:31 -05:00
MEEPofFaith
a3270debac Fix collideLine (#8037) 2023-01-07 14:46:19 -05:00
Github Actions
cf392d13ed Automatic bundle update 2023-01-07 19:43:14 +00:00
Prosta4okua
574a10e5f8 🍉🍉🍉 Watermelons have deployed. Prepare yourself for new Ukrainian translation for v7 release (#7885)
* hehe

* Finished translation. Need to proofread. Added 2 missing entries.

* Fixes

* Fixes #2

* Added button Random to translations and fixed error

* Fixes from @1stvaliduser

* fixes

* fixes

* будівль -> будівель
2023-01-07 14:42:27 -05:00
Anuken
eb410af371 sandbox is now actually sandbox again 2023-01-07 14:41:12 -05:00
Anuken
542bf2b413 Fixed #8084 2023-01-07 14:26:25 -05:00
Anuken
723b10af57 Fixed #7944 2023-01-07 14:18:07 -05:00
Anuken
1394c49e48 Fixed #8008 2023-01-07 14:10:41 -05:00
Anuken
d8ecdff698 Merge remote-tracking branch 'origin/master' 2023-01-07 14:01:33 -05:00
Anuken
2a71f4620e Fixed #7962 2023-01-07 14:01:28 -05:00
Slotterleet
fe99c7da62 Update bundle_ru.properties (#7973) 2023-01-07 14:00:32 -05:00
Anuken
0b00747f29 Merge remote-tracking branch 'origin/master' 2023-01-07 13:53:07 -05:00
Anuken
ae4a41cd0b Fixed #8042 2023-01-07 13:53:03 -05:00
GlennFolker
93f630bb69 Make custom Env flag reliably possible (#8019)
* Make custom Env flag reliably possible

* screw you

* "compatibility" for mods that don't use add()
2023-01-07 13:48:28 -05:00
Anuken
d7d5ba7510 Fixed #8060 2023-01-07 13:44:34 -05:00
Anuken
e846084942 Merge remote-tracking branch 'origin/master' 2023-01-07 13:42:48 -05:00
Anuken
a15b887e5c Fixed #8011 2023-01-07 13:42:43 -05:00
Github Actions
4e51586b3b Automatic bundle update 2023-01-07 18:23:43 +00:00
Phinner
d3a90d68d1 Update bundle_fr.properties (reopen of #7883) (#7918)
* pull #7883

* add new translations

* add these fine gentlemen to the contributors

* bateau -> vaisseau

* forgor again 💀
2023-01-07 13:22:58 -05:00
Github Actions
78973d3f12 Automatic bundle update 2023-01-07 18:17:21 +00:00
Anuken
c37ad9210a Merge remote-tracking branch 'origin/master' 2023-01-07 13:15:59 -05:00
Anuken
246591eab4 Fixed #8119 2023-01-07 13:15:56 -05:00
MEEPofFaith
eb0481a1da Cargo units *will* chase you down if you pick up their target. (#8033) 2023-01-07 12:55:19 -05:00
Garen7
ba72e9c50d Fixes Tanks rotating needlessly after attack commands (#8112)
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2023-01-07 12:54:26 -05:00
Anuken
54a9955e30 #8126 2023-01-07 12:44:29 -05:00
Anuken
49bcbafdaa Fixed #7946 2023-01-07 12:39:12 -05:00
Anuken
b4137dca6e Fixed #7978 2023-01-07 12:37:37 -05:00
Anuken
98f869ecea Fixed #8086 / Fixed #8065 2023-01-07 12:15:37 -05:00
Anuken
0c9f2b2687 Fixed #8092 2023-01-07 12:06:57 -05:00
Anuken
4ec4e83823 Fixed #7932 2023-01-07 12:04:36 -05:00
Anuken
96477f7ff5 Merge remote-tracking branch 'origin/master' 2023-01-07 12:03:58 -05:00
Anuken
1236e8d342 Fixed #7922 2023-01-07 12:03:54 -05:00
MEEPofFaith
47353cc808 Power icon (#7901)
* Power icon

* Less yellow yelloow
2023-01-07 11:49:59 -05:00
MEEPofFaith
6eadac38b7 placeEffect (#7968) 2023-01-07 11:46:14 -05:00
whert-dev
0d26b9e4f8 Added angleOffset to DrawPistons (#7950) 2023-01-07 11:45:33 -05:00
Garen7
cb5351419b Updates android Readme and Gradle (#7942)
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2023-01-07 11:45:25 -05:00
Nunting
eb9b0f69bb Update bundle_ko.properties (#7992) 2023-01-07 11:44:25 -05:00
Zelaux
2c103c157a Fixed boolean setters for Structs (#8041) 2023-01-07 11:44:08 -05:00
Garen7
a3a071e520 Additional block build over options (#7993)
* Adds missing block groups

* Allows electrolyzers to be rotated by bulding over them too

Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2023-01-07 11:43:23 -05:00
MEEPofFaith
5af8236643 Move beam drill facing update (Fix minor graphical glitch) (#8004)
* move beam drill facing update

* Add updateFacing back to updateTile

* Stop consuming if not drilling anything.
2023-01-07 11:43:07 -05:00
Github Actions
bf07deafc6 Automatic bundle update 2023-01-07 16:40:17 +00:00
kituta
2809a083a0 Update bundle_ja.properties (#8006)
* Update bundle_ja.properties

一部を翻訳 // Translated in part.

1244 Factions 派閥ではなくチームでも良いかもしれません

* Update bundle_ja.properties

セクター名と説明文 //Sector Name and Description
ブロックの説明文 //Block Description

* Update bundle_ja.properties

Jun 3, 2021 Partial 7.0 merge - API preview から Nov 14, 2022 Revert hold time までの原語版の追記変更を適用しました。//Applied changes additions from Jun 3, 2021 to Nov 14, 2022.
チュートリアル、現在目標(左上)、ユニット説明文などを翻訳//Translated tutorial text, current target text (upper left), unit description, etc.

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

セルプロの説明文を原語版に合わせました。 // The description of Serpulo has been adapted to the original language version.
語句の変更 // Changed a word or phrase.

「依存関係」を「前提Mod」にしました。

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

ブロックの説明文を整理しました。 // Organized block descriptions.

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

Don't translate these yet! だったので戻しました。// Since it was "Don't translate these yet!", I returned the corresponding text.

* Update bundle_ja.properties

翻訳の追加と微修正 // Translations were added and minor corrections were made.

* Update bundle_ja.properties

脱字を修正 // Fixed a typo

* Update bundle_ja.properties

表記ゆれの統一 // Uniformity of notation

* Update bundle_ja.properties

* Update bundle_ja.properties

誤字の修正 // Correction of typos
2023-01-07 11:39:31 -05:00
end-me-please
b18fd82a21 Update LogicBlock.java (#8032) 2023-01-07 11:39:05 -05:00
null
9dcb8b7bd5 yay more hardcoded regions (#8021)
* change fuckall

* more of this

* typo
2023-01-07 11:38:12 -05:00
MEEPofFaith
9af9e1459d Fix only 1 ammoType displaying with missile units (#8020) 2023-01-07 11:37:39 -05:00
Anuken
4d77a6d475 Merge remote-tracking branch 'origin/master' 2023-01-07 11:36:52 -05:00
Anuken
64a9377006 #8040 but better 2023-01-07 11:36:48 -05:00
Garen7
c20d7f2b4f Fixes the damage modifier not working sometimes (#8124)
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2023-01-07 11:30:49 -05:00
Garen7
b57cde7148 Fixes polies helping the enemy team in pvp (#8056)
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2023-01-07 11:29:46 -05:00
buthed010203
a5fd29e56d Fix crash when toString returns null value (#8067)
* Fix crash when toString returns null value

* Return a string from NullUnit toString

* Begone redundancy

* Unwrap before null check to ensure non-nullability
2023-01-07 11:28:01 -05:00
Anuken
c0b819ec9b Fixed #7952 2023-01-07 11:27:15 -05:00
Anuken
30e36d5640 Merge remote-tracking branch 'origin/master' 2023-01-07 11:24:02 -05:00
Anuken
0582ba1c47 Oct now has an octagon shield 2023-01-07 11:23:55 -05:00
Epowerj
141902d012 Merge pull request #8085 from xem8k5/patch-24
Update v7 Server list // server lists cleaned up
2022-12-29 01:08:02 -05:00
xem8k5
fd5b8a32a1 Update servers_v7.json 2022-12-25 17:27:38 +08:00
Epowerj
fc91cf6d44 Merge pull request #7957 from Brandons404/master
Update v7 Server list | changed hosts for one of my servers
2022-12-23 18:51:00 -05:00
Epowerj
a5de521e6e Merge pull request #7991 from Darkness6030/patch-1
darkdustry.tk -> darkdustry.net
2022-12-22 02:35:43 -05:00
Anuken
243c50be02 Faster entity removal 2022-12-14 16:58:58 -05:00
Даркнесс#3729
c601114a43 darkdustry.tk -> darkdustry.net
Also added a new gamemode: https://github.com/xzxadixzx/hex-industry
2022-11-24 20:48:10 +03:00
Recessive
0fcab7db62 Added AA Plague to V7 server list (#7913)
Will update the server to V7 once the PR is accepted. For now I'll leave it as V6 so the few players who haven't updated have something to play
2022-11-20 00:16:20 -05:00
Brandons404
b89a5ff3b5 changed hosts for one of my servers 2022-11-19 12:07:15 -06:00
Epowerj
1180764dab Fixed some weird issues on stronghold 2022-11-16 14:40:47 -05:00
Anuken
7f292b14a7 Merge remote-tracking branch 'origin/master' 2022-11-13 13:26:23 -05:00
Anuken
f7f3d5bde3 Revert hold time 2022-11-13 13:26:19 -05:00
Github Actions
f400ccc66a Automatic bundle update 2022-11-13 16:14:54 +00:00
Anuken
3a4a37cf0c Fixed mod version requirement text missing 2022-11-13 11:14:04 -05:00
Anuken
42af4e6b7e Merge remote-tracking branch 'origin/master' 2022-11-13 10:26:45 -05:00
Anuken
f4e90bfb6b Crash fix 2022-11-13 10:26:40 -05:00
Github Actions
4f912f25ee Automatic bundle update 2022-11-13 15:05:50 +00:00
Slotterleet
3ca68e426c [RU] Fixed typos and new translations (#7897)
* [RU] Fixed typos and new translations

* One. Single. Typo.

* New Onset objective
2022-11-13 10:05:14 -05:00
Joan Josep
20f8fd79ff Update bundle_ca.properties (#7907)
Co-authored-by: Anuken <arnukren@gmail.com>
2022-11-13 10:04:54 -05:00
VaporSpace2
a101f21de0 remove Generic survival sever from v6 server list (#7903)
updated server to v7
2022-11-13 09:59:29 -05:00
VaporSpace2
509760eeb1 add generic survival server to v7 server list (#7904)
process of updating generic survival server
2022-11-13 09:59:22 -05:00
OpalSoPL
d4a7b49233 Update bundle_pl.properties (#7891)
small change in translation (line 1811 only)
2022-11-13 09:58:51 -05:00
Nunting
0db2e40e27 Update bundle_ko.properties (#7889) 2022-11-13 09:58:44 -05:00
SoMall-dumpling
6a8fe28e70 Update bundle_zh_CN.properties (#7888)
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
2022-11-13 09:58:34 -05:00
Angel-24
23067674c9 Update bundle_es.properties (#7848) 2022-11-13 09:58:24 -05:00
Volas171
7b3f5d3848 Update servers_v7.json (#7905) 2022-11-13 09:58:18 -05:00
Anuken
b422e041f4 Fixed #7906 2022-11-13 09:57:09 -05:00
Anuken
80046ba505 Fixed #7884 2022-11-13 09:53:18 -05:00
Anuken
7e0a6798be Merge remote-tracking branch 'origin/master' 2022-11-13 09:49:47 -05:00
Anuken
afcb187c53 Fixed #7887 2022-11-13 09:49:42 -05:00
Github Actions
883ecb97d0 Automatic bundle update 2022-11-13 14:36:41 +00:00
Anuken
4c51b97667 Fixed #7893 / Fixed #7902 2022-11-13 09:35:48 -05:00
Anuken
7d695784d1 Merge remote-tracking branch 'origin/master' 2022-11-11 15:08:42 -05:00
Anuken
59ca257cca Fixed #7874 2022-11-11 15:08:38 -05:00
Volas171
4a78478ab2 Update servers_v7.json (#7880) 2022-11-11 14:14:17 -05:00
Volas171
557647e0bd Update servers_v7.json (#7879) 2022-11-11 13:35:52 -05:00
Drylian
a79557b917 Update servers_v7.json (#7876)
Add alternight server
2022-11-11 13:30:22 -05:00
Drylian
ae0e78e012 Update servers_v6.json (#7875)
remove alternight v6
2022-11-11 13:30:06 -05:00
Bill Arndt
899e32eeed Update servers_v6.json (#7877)
now that v7 is released, v6 Eviction server will be permanently retired.
2022-11-11 13:29:49 -05:00
Volas171
c3732e51f7 Update servers_v6.json (#7878) 2022-11-11 13:29:43 -05:00
Phinner
30eda697fa Update servers_v7.json (#7873)
* Update servers_v7.json

I come back from the deads, with an extra server.

* The forbidden comma
2022-11-11 11:27:13 -05:00
Epowerj
bf9d61ce3a Updated onset description 2022-11-11 10:26:49 -05:00
Anuken
fd911539ee Merge remote-tracking branch 'origin/master' 2022-11-11 09:53:08 -05:00
Anuken
93fcd3ad21 Fixed fire rate % 2022-11-11 09:53:04 -05:00
ulwepo
4525ad2cb1 Update servers_v7.json (#7872)
Sakura is a Japanese server.
I add some mode.
Congrats on v7 release.
Thank you.
2022-11-11 09:47:20 -05:00
Gureumi
49501b997f Remove dead servers (#7871) 2022-11-11 09:35:13 -05:00
SoMall-dumpling
a1cc3b4b26 Update bundle_zh_CN.properties (#7870) 2022-11-11 06:18:29 -05:00
Github Actions
8b197b378f Automatic bundle update 2022-11-11 10:36:04 +00:00
Phinner
4b73d809f0 Finishing french translation for release (#7774)
* partial translation

* equalize to the original file

* translated 1775 to 1794

* 1805 to 1831 + escaping [

* 791, 792, 793 + hortifixes

* small translations

* yay, more merged translations
2022-11-11 05:35:06 -05:00
SoMall-dumpling
55d490159f Update bundle_zh_CN.properties (#7869) 2022-11-11 05:34:27 -05:00
TheRadioactiveBanana
68024ec78c Adding eradicationdustry survival pvp (#7865) 2022-11-11 05:24:51 -05:00
Даркнесс#3729
df3e455666 translate new texts, fix old (#7867) 2022-11-11 05:24:40 -05:00
Nunting
7cdd383509 Update bundle_ko.properties (#7868) 2022-11-11 05:24:30 -05:00
Anuken
edfc16c7b0 Fixed about dialog on mobile 2022-11-10 23:36:45 -05:00
Anuken
fbadbb1d98 Fixed #7863 2022-11-10 23:07:57 -05:00
Anuken
b021198893 Merge remote-tracking branch 'origin/master' 2022-11-10 22:45:13 -05:00
Anuken
619f2c86a4 Fixed iOS menu 2022-11-10 22:45:08 -05:00
Github Actions
7fd91fc584 Automatic bundle update 2022-11-11 02:42:15 +00:00
ThatOneBepis
09a3928cb1 Update bundle_sr.properties (#7862) 2022-11-10 21:41:28 -05:00
end-me-please
45bbc16a8f update german translation (#7860)
* updated german translation

* sector descriptions

* ,
2022-11-10 19:24:09 -05:00
Anuken
09f96b1477 Merge remote-tracking branch 'origin/master' 2022-11-10 19:00:39 -05:00
Anuken
c0da3e6e9f fabric 2022-11-10 19:00:35 -05:00
Github Actions
ec124652e4 Automatic bundle update 2022-11-10 23:57:28 +00:00
Anuken
479cf85a3b Merge remote-tracking branch 'origin/master' 2022-11-10 18:56:39 -05:00
Anuken
c3906ebae1 Merge remote-tracking branch 'origin/master' 2022-11-10 18:56:36 -05:00
Thomas Widyantoko
6ebe78e4b5 added Erekir descriptions and stuffs (#7548)
- erekt
- ravine sector description
- erekir core descriptions
- processors

more later

Co-authored-by: Anuken <arnukren@gmail.com>
2022-11-10 18:56:36 -05:00
Anuken
463afaafe8 wording 2022-11-10 18:56:26 -05:00
L0615T1C5-216AC-9437
49b89f5b8e Add 2 more ports for chaotic neutral (#7859) 2022-11-10 17:23:18 -05:00
Github Actions
6968ccc19b Automatic bundle update 2022-11-10 22:17:45 +00:00
Anuken
bc96077d73 Merge remote-tracking branch 'origin/master' 2022-11-10 17:16:55 -05:00
Anuken
255e15d14c Added some missing block descriptions 2022-11-10 17:16:50 -05:00
Github Actions
544835fdda Automatic bundle update 2022-11-10 21:38:54 +00:00
Anuken
2642ed358a Merge remote-tracking branch 'origin/master' 2022-11-10 16:37:54 -05:00
Anuken
642d27c163 Fixed missing block name 2022-11-10 16:37:50 -05:00
Github Actions
8cdb32e476 Automatic bundle update 2022-11-10 18:43:12 +00:00
Epowerj
9457680bae Added peaks and marsh descriptions 2022-11-10 13:42:15 -05:00
Anuken
05e4175a16 Merge remote-tracking branch 'origin/master' 2022-11-10 12:43:33 -05:00
Anuken
f98c4cd820 No longer in beta 2022-11-10 12:43:29 -05:00
null
75a47a2e5f unhard code sorter cross region, I guess (#7858)
* someone asked for this

* it didn't save fuck

* this, again
2022-11-10 12:39:54 -05:00
Anuken
e198da53e4 Merge remote-tracking branch 'origin/master' 2022-11-10 12:15:55 -05:00
Anuken
c1e783ba71 PayloadSource UnitCreateEvent 2022-11-10 12:15:51 -05:00
Github Actions
3dfb8c4c20 Automatic bundle update 2022-11-10 16:41:24 +00:00
Catchears
d81500d99d german translation (again) (#7232)
* update to 9a3a6c31b3

* shawak's requested changes

* update sector names

no one has opposed them yet, so we'll give them a try

* oops, accidentally modified english bundle, reverting

* update translation to a54907583b

* changes as requested by shawak

* update to 522070be4b

* @stuffyAI's changes

* update to 69a7354468

* remove duplicate entries

new translations are quite plentiful, will take a bit to get done

* update to 99df85df1c

* vereinheitlichung - siehe commitbeschreibung

unterschied zwischen items und materialien verdeutlichen
vereinheitlichung von 'fracht' als begriff für 'payload'

ich halte diese verändernungnen für vernünftig, bin aber wie immer offen für andere vorschläge

bei 'materialeinheiten' (unit.items, zeile 976) bin ich mir unsicher, ob der begriff inzwischen veraltet ist (stattdessen lieber items?) - er wird nur an zwei stellen benutzt, die nur vor jahren bearbeitet wurden. ich habe ihn erstmal beibehalten.

* update to f968a8689c

* update to 85228bad0a

* update to e3d1a04626

* update to 634ece405f

I'll probably be keeping this PR more up to date as we get closer to v7 release date, feel free to unsub from the PR if it gets annoying.

* update to ebb37f4abe

* der Mod -> die Mod

Mod, abgeleitet von Modifikation (f), sollte mMn weiterhin feminin bleiben.

* update to 8f9736d1d9

* update to c3d9a501c6

hopefully final update

* add changes from https://github.com/Anuken/Mindustry/pull/6999/files

Co-authored-by: end-me-please <90796271+end-me-please@users.noreply.github.com>

Co-authored-by: end-me-please <90796271+end-me-please@users.noreply.github.com>
2022-11-10 11:40:35 -05:00
Pointifix
7a04cb060d Update servers_v7.json (#7855)
Currently still in v6 but as soon as v7 is the official version on Steam tomorrow i will migrate to v7, please add the address/ddns beforehand so my users dont have to wait for the server to be added tomorrow. Thank you!
(Currently Sectorized v7 is reachable under the port 6568, so sectorized.freeddns.org:6568 but i will change to port back to the default mindustry port tomorrow)
2022-11-10 09:40:59 -05:00
Даркнесс#3729
2a11ac6414 fixes (#7856) 2022-11-10 09:18:09 -05:00
Github Actions
89e3f2a2fa Automatic bundle update 2022-11-10 13:24:03 +00:00
Anuken
5440ffcaf9 Merge remote-tracking branch 'origin/master' 2022-11-10 08:22:59 -05:00
Anuken
3fe38e8925 Better fix for #7854 2022-11-10 08:22:53 -05:00
Даркнесс#3729
fcca002823 [Translation] RU V7 translation (#7785)
* [Translation] RU V7 translation

* Категории процессоров

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* 👀

* Update bundle_ru.properties

* скилл исьюше

* Подсказки для командного режима

* Немного перевел цели секторов

* попробовал сделать описания юнитов :/

* Update bundle_ru.properties

* Update bundle_ru.properties

* дрели

* Create bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* нагрев -> тепло

* Подсказки

* Update contributors

* Update bundle_ru.properties

* скилл иссуе

* Update bundle_ru.properties

Co-authored-by: Evgenij <86189625+Kowkodivka@users.noreply.github.com>
Co-authored-by: Slotterleet <62336673+Slotterleet@users.noreply.github.com>
2022-11-10 08:22:10 -05:00
Jerzozwierz
11e35370be Update bundle_pl because 11.11 is close (#7853) 2022-11-09 14:14:37 -05:00
Anuken
2e9026936e Less floating menu buttons 2022-11-09 14:05:22 -05:00
Anuken
1651dc520c Better inset borders for phones 2022-11-09 13:56:53 -05:00
Anuken
ef526a6d83 Merge remote-tracking branch 'origin/master' 2022-11-09 13:29:17 -05:00
Anuken
be72da71de map name 2022-11-09 13:29:13 -05:00
Nunting
b0303e84a3 Update bundle_ko.properties (#7850) 2022-11-09 08:47:50 -05:00
Anuken
37f1760a59 Renamed 'erekir waves map' 2022-11-09 08:45:11 -05:00
Anuken
8d255b3ccd Fixed #7852 2022-11-09 08:31:19 -05:00
Anuken
1842e9d139 Merge remote-tracking branch 'origin/master' 2022-11-09 08:30:01 -05:00
Anuken
8f7419db71 Fixed #7851 2022-11-09 08:29:53 -05:00
Anuken
56eb1a084c Revert "Fixing a mistake I made (#7788)"
This reverts commit 3c7ddc8375.
2022-11-09 08:29:32 -05:00
Github Actions
e5e41b497d Automatic bundle update 2022-11-09 02:46:35 +00:00
Anuken
52d2d25790 Merge remote-tracking branch 'origin/master' 2022-11-08 21:44:53 -05:00
Anuken
c3d9a501c6 Campaign completion text in bundle 2022-11-08 21:44:47 -05:00
Nunting
baa7580e13 Update bundle_ko.properties (#7806) 2022-11-08 18:47:17 -05:00
Anuken
464feaa80e Merge remote-tracking branch 'origin/master' 2022-11-08 16:52:18 -05:00
Anuken
ddadbab74d Canvas block blending 2022-11-08 16:52:12 -05:00
ienov
84388dd27f add EasyPlay.su server to global list (#7847) 2022-11-08 11:30:16 -05:00
Lonami
41562ac6c1 Don't stop mining while commanding units (#7844)
This addresses https://github.com/Anuken/Mindustry-Suggestions/issues/4077.
2022-11-08 08:57:27 -05:00
MEEPofFaith
8f9736d1d9 Make certain negative stats red (#7842) 2022-11-07 21:28:28 -05:00
MEEPofFaith
68434ad42e Clearer Building Damage Multiplier Stat (#7471) 2022-11-07 17:59:47 -05:00
BF 109 F-4
3c7ddc8375 Fixing a mistake I made (#7788)
* Add files via upload

* Delete Erekir Waves Map better.msav

* Fixing a mistake

I uploaded it incorrectly last time so I'm fixing it.

* Old version

Fixed
2022-11-07 15:50:47 -05:00
Anuken
381197d58f Merge remote-tracking branch 'origin/master' 2022-11-07 15:07:36 -05:00
Anuken
09b65fddb8 Fixed #7841 2022-11-07 15:07:32 -05:00
Github Actions
4050812b84 Automatic bundle update 2022-11-07 16:28:17 +00:00
Anuken
927566e038 Merge remote-tracking branch 'origin/master' 2022-11-07 11:27:11 -05:00
Anuken
a329c4944b Fixed #7839 2022-11-07 11:27:07 -05:00
Github Actions
47a38d2bb8 Automatic bundle update 2022-11-07 15:22:08 +00:00
SoMall-dumpling
d20f4c42a7 Update bundle_zh_CN.properties (#7666)
* Update bundle_zh_CN.properties

Translations for v139

* Update bundle_zh_CN.properties

abcigch的建议/其他修改

* Update bundle_zh_CN.properties

保姆级教学

* Update bundle_zh_CN.properties

补完

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

地图名字太难翻译啦!但是还是要翻译!怎么办!

* Update bundle_zh_CN.properties

先这样吧

* Update bundle_zh_CN.properties

a tweak to origin
2022-11-07 10:21:20 -05:00
Github Actions
14984f6a02 Automatic bundle update 2022-11-07 14:44:21 +00:00
ThatOneBepis
e428e33cd2 Update bundle_sr.properties (#7810)
Co-authored-by: Anuken <arnukren@gmail.com>
2022-11-07 09:43:16 -05:00
Anuken
ce36b750e3 Merge remote-tracking branch 'origin/master' 2022-11-07 08:43:26 -05:00
Anuken
e0021f3714 Fixed #7837 2022-11-07 08:43:22 -05:00
MEEPofFaith
810a905af3 Allow heat region to produce light (#6879)
* Allow heat region to produce light

* Method overload for backwards compatability
2022-11-06 14:28:59 -05:00
Anuken
83be0116c6 Merge remote-tracking branch 'origin/master' 2022-11-06 13:38:44 -05:00
Anuken
3a0b1a6cf5 Fixed missile unit DPS calculation 2022-11-06 13:38:38 -05:00
Xasmedy
5caad7493f Adding mindustry.ddns.net (#7833) 2022-11-05 22:14:14 -04:00
Xasmedy
7c70e371e2 Removing mindustry.ddns.net (#7832)
The servers have switched to v7. (Except one)
2022-11-05 22:14:07 -04:00
Github Actions
d91a338f3d Automatic bundle update 2022-11-05 21:08:33 +00:00
Angel-24
9537cad965 Update bundle_es.properties (#7767)
* Update bundle_es.properties

Updated spanish translation. Tutorials, mods messages, and more.

* Update bundle_es.properties

* ImUrX's review

* Bloques "integrados" -> Bloques "estáticos"

Renamed "world" blocks.

* Update bundle_es.properties

Co-authored-by: Anuken <arnukren@gmail.com>
2022-11-05 17:07:50 -04:00
Anuken
dc2a68573b Fixed #7829 2022-11-05 15:03:57 -04:00
Anuken
8bba2459f2 Fixed #7826 2022-11-05 08:56:44 -04:00
Anuken
3390c08d44 Merge remote-tracking branch 'origin/master' 2022-11-05 08:36:10 -04:00
Anuken
0b7156ce13 Fixed #7827 2022-11-05 08:36:06 -04:00
MEEPofFaith
e914cb59cd Idle weapon reset to baseRotation (#7825) 2022-11-05 07:05:55 -04:00
Github Actions
58e9d641f0 Automatic bundle update 2022-11-04 23:35:50 +00:00
Garen7
82fffb1285 Adds select all unit production hotkey (#7824)
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2022-11-04 19:34:44 -04:00
Github Actions
e7b7fc971a Automatic bundle update 2022-11-04 22:00:43 +00:00
RTOmega
6ecf9b1e73 TR V7 Translate (#7822)
wow this took a really long time
2022-11-04 17:59:50 -04:00
Anuken
bd0085a701 Merge remote-tracking branch 'origin/master' 2022-11-04 17:28:32 -04:00
Anuken
a3afb7c726 Fixed #7821 2022-11-04 17:28:28 -04:00
MEEPofFaith
d42c0e3c48 baseRotation + rotationLimit compatability (#7820) 2022-11-04 16:04:35 -04:00
Anuken
f9d7c172c4 Possible minimap fog update fix for servers 2022-11-04 15:14:06 -04:00
Anuken
13d726108b Fixed #7818 2022-11-04 11:23:02 -04:00
Anuken
07a1c6c2c4 Merge remote-tracking branch 'origin/master' 2022-11-04 08:59:29 -04:00
Anuken
9f0a1d863e Fixed #7815 2022-11-04 08:59:24 -04:00
MEEPofFaith
36a7e98f86 Show build cost even in sandbox (#7814) 2022-11-03 23:27:46 -04:00
matusm1
3a0f4409fc Precision errors in float to string methods (#7809)
* replaced fixValue with autoFixed

* Reverted, only fixValue implementation
2022-11-03 18:02:24 -04:00
Github Actions
e073eca93c Automatic bundle update 2022-11-03 16:15:17 +00:00
Anuken
4e5bc8fc94 Rebuild select hint 2022-11-03 12:11:35 -04:00
Anuken
4a6791ab43 Merge remote-tracking branch 'origin/master' 2022-11-03 11:39:16 -04:00
Anuken
3a142507d1 redundant log 2022-11-03 11:39:11 -04:00
Ilya246
78f2a21a92 Update servers_v7.json (#7807) 2022-11-03 11:38:03 -04:00
Anuken
b8e245f945 Tested and fixed Steam achievements 2022-11-03 11:37:37 -04:00
Anuken
b1be360180 Merge remote-tracking branch 'origin/master' 2022-11-03 09:08:53 -04:00
Anuken
679e6bd27b Removed screenshots from game data export 2022-11-03 09:08:49 -04:00
Github Actions
f21cea225b Automatic bundle update 2022-11-03 13:04:48 +00:00
osoitz
e12aee6961 Update bundle_eu.properties (#7727)
Co-authored-by: Anuken <arnukren@gmail.com>
2022-11-03 09:03:55 -04:00
Github Actions
6abb549b18 Automatic bundle update 2022-11-03 12:59:57 +00:00
Nunting
161bb87eb8 Update bundle_ko.properties (#7800) 2022-11-03 08:58:59 -04:00
Anuken
7e0a6b985c Fixed #7804 / Fixed #7803 2022-11-03 08:57:15 -04:00
Anuken
d1f7fce7f9 Merge remote-tracking branch 'origin/master' 2022-11-03 08:45:13 -04:00
Anuken
cef2778d43 Fixed #7803 2022-11-03 08:45:07 -04:00
Lucky Clover
993f3973d2 worldMessage.targetable=false (#7802)
turret would try to attack worldMessage but cant hit it
so why not combine privileged with targetable(
2022-11-02 23:52:23 -04:00
Github Actions
4c0664c068 Automatic bundle update 2022-11-02 14:02:46 +00:00
Anuken
ebb37f4abe Fixed ability descriptions 2022-11-02 10:01:43 -04:00
Anuken
696d5e77ca Merge remote-tracking branch 'origin/master' 2022-11-02 08:37:16 -04:00
Anuken
74839a7f8d Fixed #7801 2022-11-02 08:37:11 -04:00
Catchears
5c353b1807 this game -> mod caused errors (#7799) 2022-11-01 19:38:53 -04:00
Anuken
3e6c54069d Merge remote-tracking branch 'origin/master' 2022-11-01 16:28:30 -04:00
Anuken
34a83de3cf Misc fixes 2022-11-01 16:28:24 -04:00
null
1624bb4502 fix factory plan icon scaling, unhardcode node beam regions (#7796)
* unfuck factory plan icon scaling, unhardcode node beam regions

* fix
2022-11-01 11:25:28 -04:00
Anuken
ff115ee376 Heat icon 2022-11-01 10:57:41 -04:00
Anuken
5a44bf6023 Merge remote-tracking branch 'origin/master' 2022-11-01 08:47:05 -04:00
Anuken
7f37b97861 Removed serverPaused 2022-11-01 08:47:00 -04:00
null
d5bea214cb make small paydriver have dark shade and palette change (#7794) 2022-11-01 07:57:09 -04:00
Anuken
bc2664994e Fixed #7793 2022-11-01 07:53:47 -04:00
Anuken
aef18b8696 Fixed #7795 2022-11-01 07:52:24 -04:00
413 changed files with 13113 additions and 9087 deletions

View File

@@ -23,6 +23,8 @@ jobs:
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Add Arc release - name: Add Arc release
run: | run: |
git config --global user.email "actions@github.com"
git config --global user.name "Github Actions"
git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
cd ../Arc cd ../Arc
git tag ${RELEASE_VERSION} git tag ${RELEASE_VERSION}

View File

@@ -40,6 +40,8 @@ jobs:
- name: Update JITpack repo - name: Update JITpack repo
if: ${{ github.repository == 'Anuken/Mindustry' }} if: ${{ github.repository == 'Anuken/Mindustry' }}
run: | run: |
git config --global user.name "Github Actions"
git config --global user.email "cli@github.com"
cd ../ cd ../
cp -r ./Mindustry ./MindustryJitpack cp -r ./Mindustry ./MindustryJitpack
cd MindustryJitpack cd MindustryJitpack

55
LICENSE
View File

@@ -617,58 +617,3 @@ reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee. copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

View File

@@ -39,10 +39,13 @@ Server builds are bundled with each released build (in Releases). If you'd rathe
### Android ### Android
1. Install the Android SDK [here.](https://developer.android.com/studio#command-tools) Make sure you're downloading the "Command line tools only", as Android Studio is not required. 1. Install the Android SDK [here.](https://developer.android.com/studio#command-tools) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
2. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory. 2. In the unzipped Android SDK folder, find the cmdline-tools directory. Then create a folder inside of it called `latest` and put all of its contents into the newly created folder.
3. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`. 3. In the same directory run the command `sdkmanager --licenses` (or `./sdkmanager --licenses` if on linux/mac)
4. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
5. Enable developer mode on your device/emulator. If you are on testing on a phone you can follow [these instructions](https://developer.android.com/studio/command-line/adb#Enabling), otherwise you need to google how to enable your emulator's developer mode specifically.
6. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
To debug the application on a connected phone, run `gradlew android:installDebug android:run`. To debug the application on a connected device/emulator, run `gradlew android:installDebug android:run`.
### Troubleshooting ### Troubleshooting

View File

@@ -1,7 +1,7 @@
### 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_v6.json) in this repository. This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v7.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:
@@ -9,20 +9,22 @@ You may want to add your server to this list. The steps for getting this done ar
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. 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"]`. 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 ["canvas", "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: 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.
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. **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.
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. **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`).
6. 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_v6.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_v7.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 `example.com:6000`, you would add a comma after the last entry and insert:
```json ```json
{ {
"address": "google.com" "address": "example.com:6000"
} }
``` ```
Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments. > Note that Mindustry also support SRV records. This allows you to use a subdomain for your server address instead of specifying the port. For example, if you want to use `play.example.com` instead of `example.com:6000`, in the dns settings of your domain, add an SRV record with `_mindustry` as the service, `tcp` as the protocol, `play` as the target and `6000` as the port. You can also setup fallback servers by modifying the weight or priority of the record. Although SRV records are very convenient, keep in mind they are slower than regular addresses. Avoid using them in the server list, but rather as an easy way to share your server address.
Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.

View File

@@ -122,8 +122,14 @@ dependencies{
natives "com.github.Anuken.Arc:natives-android:${getArcHash()}" natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}" natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
//TODO dynamically find best android platform jar instead of hard-coding to 30 def version;
def sdkFile = new File((String)findSdkDir(), "/platforms/android-30/android.jar") def highestVersion;
new File((String)findSdkDir(), "/platforms").eachFileMatch ~/android-\d+/, {
version = it.name.find(/\d+/).toInteger();
highestVersion = version > highestVersion ? version : highestVersion;
}
def sdkFile = new File((String)findSdkDir(), "/platforms/android-${highestVersion}/android.jar")
if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath) if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
} }

View File

@@ -42,6 +42,7 @@ public class EntityProcess extends BaseProcessor{
Seq<Selement> allDefs = new Seq<>(); Seq<Selement> allDefs = new Seq<>();
Seq<Stype> allInterfaces = new Seq<>(); Seq<Stype> allInterfaces = new Seq<>();
Seq<TypeSpec.Builder> baseClasses = new Seq<>(); Seq<TypeSpec.Builder> baseClasses = new Seq<>();
ObjectSet<TypeSpec.Builder> baseClassIndexers = new ObjectSet<>();
ClassSerializer serializer; ClassSerializer serializer;
{ {
@@ -232,9 +233,15 @@ public class EntityProcess extends BaseProcessor{
Stype repr = types.first(); Stype repr = types.first();
String groupType = repr.annotation(Component.class).base() ? baseName(repr) : interfaceName(repr); String groupType = repr.annotation(Component.class).base() ? baseName(repr) : interfaceName(repr);
String name = group.name().startsWith("g") ? group.name().substring(1) : group.name();
boolean collides = an.collide(); boolean collides = an.collide();
groupDefs.add(new GroupDefinition(group.name().startsWith("g") ? group.name().substring(1) : group.name(), groupDefs.add(new GroupDefinition(name,
ClassName.bestGuess(packageName + "." + groupType), types, an.spatial(), an.mapping(), collides)); ClassName.bestGuess(packageName + "." + groupType), types, an.spatial(), an.mapping(), collides));
TypeSpec.Builder accessor = TypeSpec.interfaceBuilder("IndexableEntity__" + name);
accessor.addMethod(MethodSpec.methodBuilder("setIndex__" + name).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).addParameter(int.class, "index").returns(void.class).build());
write(accessor);
} }
ObjectMap<String, Selement> usedNames = new ObjectMap<>(); ObjectMap<String, Selement> usedNames = new ObjectMap<>();
@@ -260,6 +267,8 @@ public class EntityProcess extends BaseProcessor{
//get base class type name for extension //get base class type name for extension
Stype baseClassType = baseClasses.any() ? baseClasses.first() : null; Stype baseClassType = baseClasses.any() ? baseClasses.first() : null;
@Nullable TypeName baseClass = baseClasses.any() ? tname(packageName + "." + baseName(baseClassType)) : null; @Nullable TypeName baseClass = baseClasses.any() ? tname(packageName + "." + baseName(baseClassType)) : null;
@Nullable TypeSpec.Builder baseClassBuilder = baseClassType == null ? null : this.baseClasses.find(b -> Reflect.<String>get(b, "name").equals(baseName(baseClassType)));
boolean addIndexToBase = baseClassBuilder != null && baseClassIndexers.add(baseClassBuilder);
//whether the main class is the base itself //whether the main class is the base itself
boolean typeIsBase = baseClassType != null && type.has(Component.class) && type.annotation(Component.class).base(); boolean typeIsBase = baseClassType != null && type.has(Component.class) && type.annotation(Component.class).base();
@@ -394,6 +403,17 @@ public class EntityProcess extends BaseProcessor{
//entities with no sync comp and no serialization gen no code //entities with no sync comp and no serialization gen no code
boolean hasIO = ann.genio() && (components.contains(s -> s.name().contains("Sync")) || ann.serialize()); boolean hasIO = ann.genio() && (components.contains(s -> s.name().contains("Sync")) || ann.serialize());
TypeSpec.Builder indexBuilder = baseClassBuilder == null ? builder : baseClassBuilder;
if(baseClassBuilder == null || addIndexToBase){
//implement indexable interfaces.
for(GroupDefinition def : groups){
indexBuilder.addSuperinterface(tname(packageName + ".IndexableEntity__" + def.name));
indexBuilder.addMethod(MethodSpec.methodBuilder("setIndex__" + def.name).addParameter(int.class, "index").addModifiers(Modifier.PUBLIC).addAnnotation(Override.class)
.addCode("index__$L = index;", def.name).build());
}
}
//add all methods from components //add all methods from components
for(ObjectMap.Entry<String, Seq<Smethod>> entry : methods){ for(ObjectMap.Entry<String, Seq<Smethod>> entry : methods){
if(entry.value.contains(m -> m.has(Replace.class))){ if(entry.value.contains(m -> m.has(Replace.class))){
@@ -446,8 +466,15 @@ public class EntityProcess extends BaseProcessor{
mbuilder.addStatement("if(added == $L) return", first.name().equals("add")); mbuilder.addStatement("if(added == $L) return", first.name().equals("add"));
for(GroupDefinition def : groups){ for(GroupDefinition def : groups){
//remove/add from each group, assume imported if(first.name().equals("add")){
mbuilder.addStatement("Groups.$L.$L(this)", def.name, first.name()); //remove/add from each group, assume imported
mbuilder.addStatement("index__$L = Groups.$L.addIndex(this)", def.name, def.name);
}else{
//remove/add from each group, assume imported
mbuilder.addStatement("Groups.$L.removeIndex(this, index__$L);", def.name, def.name);
mbuilder.addStatement("index__$L = -1", def.name);
}
} }
} }
@@ -577,6 +604,16 @@ public class EntityProcess extends BaseProcessor{
skipDeprecated(builder); skipDeprecated(builder);
if(!legacy){
TypeSpec.Builder fieldBuilder = baseClassBuilder != null ? baseClassBuilder : builder;
if(addIndexToBase || baseClassBuilder == null){
//add group index int variables
for(GroupDefinition def : groups){
fieldBuilder.addField(FieldSpec.builder(int.class, "index__" + def.name, Modifier.PROTECTED, Modifier.TRANSIENT).initializer("-1").build());
}
}
}
definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs, legacy)); definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs, legacy));
} }
@@ -592,7 +629,7 @@ public class EntityProcess extends BaseProcessor{
groupsBuilder.addField(ParameterizedTypeName.get( groupsBuilder.addField(ParameterizedTypeName.get(
ClassName.bestGuess("mindustry.entities.EntityGroup"), itype), group.name, Modifier.PUBLIC, Modifier.STATIC); ClassName.bestGuess("mindustry.entities.EntityGroup"), itype), group.name, Modifier.PUBLIC, Modifier.STATIC);
groupInit.addStatement("$L = new $T<>($L.class, $L, $L)", group.name, groupc, itype, group.spatial, group.mapping); groupInit.addStatement("$L = new $T<>($L.class, $L, $L, (e, pos) -> { if(e instanceof $L.IndexableEntity__$L ix) ix.setIndex__$L(pos); })", group.name, groupc, itype, group.spatial, group.mapping, packageName, group.name, group.name);
} }
//write the groups //write the groups
@@ -855,7 +892,7 @@ public class EntityProcess extends BaseProcessor{
for(Smethod method : methods){ for(Smethod method : methods){
String signature = method.toString(); String signature = method.toString();
if(signatures.contains(signature)) continue; if(!signatures.add(signature)) continue;
Stype compType = interfaceToComp(method.type()); Stype compType = interfaceToComp(method.type());
MethodSpec.Builder builder = MethodSpec.overriding(method.e).addModifiers(Modifier.PUBLIC, Modifier.FINAL); MethodSpec.Builder builder = MethodSpec.overriding(method.e).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
@@ -866,25 +903,29 @@ public class EntityProcess extends BaseProcessor{
builder.addAnnotation(OverrideCallSuper.class); //just in case builder.addAnnotation(OverrideCallSuper.class); //just in case
if(!method.isVoid()){ if(!method.isVoid()){
if(method.name().equals("isNull")){ String methodName = method.name();
builder.addStatement("return true"); switch(methodName){
}else if(method.name().equals("id")){ case "isNull":
builder.addStatement("return true");
break;
case "id":
builder.addStatement("return -1"); builder.addStatement("return -1");
}else{ break;
Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(method.name())); case "toString":
String desc = variable == null ? null : variable.descString(); builder.addStatement("return $S", className);
if(variable == null || !varInitializers.containsKey(desc)){ break;
builder.addStatement("return " + getDefault(method.ret().toString())); default:
}else{ Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(methodName));
String init = varInitializers.get(desc); String desc = variable == null ? null : variable.descString();
builder.addStatement("return " + (init.equals("{}") ? "new " + variable.mirror().toString() : "") + init); if(variable == null || !varInitializers.containsKey(desc)){
} builder.addStatement("return " + getDefault(method.ret().toString()));
}else{
String init = varInitializers.get(desc);
builder.addStatement("return " + (init.equals("{}") ? "new " + variable.mirror().toString() : "") + init);
}
} }
} }
nullBuilder.addMethod(builder.build()); nullBuilder.addMethod(builder.build());
signatures.add(signature);
} }
nullsBuilder.addField(FieldSpec.builder(type, Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build()); nullsBuilder.addField(FieldSpec.builder(type, Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build());

View File

@@ -97,14 +97,14 @@ public class StructProcess extends BaseProcessor{
} }
//[setter] + [constructor building] //[setter] + [constructor building]
if(varType == TypeName.BOOLEAN){ if(isBool){
cons.append(" | (").append(varName).append(" ? ").append("1L << ").append(offset).append("L : 0)"); cons.append(" | (").append(varName).append(" ? ").append("1L << ").append(offset).append("L : 0)");
//bools: single bit, needs special case to clear things //bools: single bit, needs special case to clear things
setter.beginControlFlow("if(value)"); setter.beginControlFlow("if(value)");
setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
setter.nextControlFlow("else");
setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, offset); setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, offset);
setter.nextControlFlow("else");
setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
setter.endControlFlow(); setter.endControlFlow();
}else if(varType == TypeName.FLOAT){ }else if(varType == TypeName.FLOAT){
cons.append(" | (").append("(").append(structType).append(")").append("Float.floatToIntBits(").append(varName).append(") << ").append(offset).append("L)"); cons.append(" | (").append("(").append(structType).append(")").append("Float.floatToIntBits(").append(varName).append(") << ").append(offset).append("L)");

View File

@@ -34,7 +34,7 @@ allprojects{
ext{ ext{
versionNumber = '7' versionNumber = '7'
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 = '0b86023401880bb5e586bc404bedbaae9b1f1c94' steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
@@ -49,7 +49,7 @@ allprojects{
} }
localArc = { localArc = {
return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists() return !project.hasProperty("release") && !project.hasProperty("noLocalArc") && new File(projectDir.parent, '../Arc').exists()
} }
arcModule = { String name -> arcModule = { String name ->

View File

@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="12"
width="12" height="12"
height="12" version="1.1"
version="1.1" id="svg380"
id="svg380" sodipodi:docname="admin.svg"
sodipodi:docname="admin.svg" inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
<metadata <metadata
id="metadata386"> id="metadata386">
<rdf:RDF> <rdf:RDF>

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="10"
width="10" height="10"
height="10" version="1.1"
version="1.1" id="svg192"
id="svg192" sodipodi:docname="distribution.svg"
sodipodi:docname="distribution.svg" inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
<metadata <metadata
id="metadata198"> id="metadata198">
<rdf:RDF> <rdf:RDF>

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="10"
width="10" height="10"
height="10" version="1.1"
version="1.1" id="svg252"
id="svg252" sodipodi:docname="effect.svg"
sodipodi:docname="effect.svg" inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
<metadata <metadata
id="metadata258"> id="metadata258">
<rdf:RDF> <rdf:RDF>

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="10"
width="10" height="13"
height="13" version="1.1"
version="1.1" id="svg310"
id="svg310" sodipodi:docname="file-image.svg"
sodipodi:docname="file-image.svg" inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
<metadata <metadata
id="metadata316"> id="metadata316">
<rdf:RDF> <rdf:RDF>

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="12"
width="12" height="12"
height="12" version="1.1"
version="1.1" id="svg300"
id="svg300" sodipodi:docname="info.svg"
sodipodi:docname="info.svg" inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
<metadata <metadata
id="metadata306"> id="metadata306">
<rdf:RDF> <rdf:RDF>

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="logic.svg"
sodipodi:docname="logic.svg" inkscape:version="1.0 (9f2f71dc58, 2020-08-02)"
inkscape:version="1.0 (9f2f71dc58, 2020-08-02)" id="svg8"
id="svg8" version="1.1"
version="1.1" viewBox="0 0 128 128">
viewBox="0 0 128 128">
<defs <defs
id="defs2" /> id="defs2" />
<sodipodi:namedview <sodipodi:namedview

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16"
width="16" height="16"
height="16" version="1.1"
version="1.1" id="svg542"
id="svg542" sodipodi:docname="planet.svg"
sodipodi:docname="planet.svg" inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
<metadata <metadata
id="metadata548"> id="metadata548">
<rdf:RDF> <rdf:RDF>

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 341 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 611 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 572 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 887 B

After

Width:  |  Height:  |  Size: 912 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 889 B

After

Width:  |  Height:  |  Size: 881 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 899 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1013 B

After

Width:  |  Height:  |  Size: 1012 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 536 B

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 416 B

After

Width:  |  Height:  |  Size: 416 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 463 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 784 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 464 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 B

View File

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 463 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 517 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 552 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1019 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 429 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 853 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 510 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 817 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 603 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 893 B

After

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

View File

@@ -1 +0,0 @@
mschxœ%ŠQƒ0 C]RÐÄ>v>9Ê"µˆ¶S(HÜ~)X±_dƒƒÏKŒa•YëD­Ý¹(¼¸äS®¢øü²§¯ÆmÃ;VIÓ^es-@

View File

@@ -1,2 +0,0 @@
mschxœ5<C593>Ë
! E¯Ïy-J·ý‡ù(q¤£Gú÷<C3BA>„ââä&'›„Î.<Zl.Çž®Vª{lG¸|<7C>ŸK4ÌíúÙðü{»/ùßR±ÅÒ~•^=ÝùäГkÑïG<C3AF>ç àzRPm!&ÆÌX+ ÉÓ†4©¨²¼H}E“y$9À˜¢XQÜÔü‰æd8ZQŠ¡†acf,Œê˜ã"

View File

@@ -1,2 +0,0 @@
mschxœ5<C593>A E¿JkêÊStã<74><08>˜I
4”šx{¡ðòÿ¼ ¸vÐѽpq<71>°—”Ý^˜Ú}æ­pŠ€ÆÄ…¼§#{Âã¯Ï>Å}SÆmtWØÏKæuÅXGÅq¤ àY¬z\P?E½:<18>ÅYŽ

View File

@@ -1,3 +0,0 @@
mschxœ%Žknà „ÇØIü¨äV9×È
ú;¢xS!a@€“úîMÝ%F¬¾Ñ>fz<>Æ©™p¾~:“¯¥}ŽëõbU$ %MÈÆ;à
ãCeŠ~rT:ûˆ^/6»*ú#yA9²Õ7ϧà#É)%ŒÚ++5¹Ímáꘌ5Ú;™f²ì18Zf•<66>S4Öb0™f™ü5áô¥2w­èƒðÎO„÷ VëÕ$ÙçN+Ÿ1(åíuÞ

View File

@@ -0,0 +1,4 @@
mschxœM<C593>anÂ0 …MK[HÚ"Ä9rŠ<63> <Ô-4(MaÜ~ÏñŸ)RŸíú{vB':Ô´<C394>ý<EFBFBD>iðç¼ú^ñ'å+Ù /ç4Ýóg"jƒÿä°PõþaÉ~¿dwIStxúÌÉñoNpˆ‰ŽK >¹»Ÿ98DW&û¯DÇ<e?OëÍ<C3AB>ãüà<17>Ý•gN^Æu¾pú
ñé®0§S|p´»{Šß\ÆØe…µËñɉš‡_C&;e¾¹%®éÌXú<58>h#gƒxKT!îˆj[ªEªˆ4*­Jé¬iG¨‡-<2D><EFBFBD>ið.<2E>ŽÉvT‰ã@åO¥Ò Ð
Þâ`É
Þ*Þ¢¥<14>Uá:á*”ÁwŠ£<C5A0>jÉ€w,/ÅNø+³~¯6{o”7:Þèx£ã<C2A3>no”7…¯Èê-¬ÚXµéÕ¦×5zµéÕ¦×5z½Å Ü ·õ#誅”-FÅGÅG}„QñƒâÁ÷tDçF-b@tõ½ÔO¼

Binary file not shown.

View File

@@ -0,0 +1 @@
mschxœMŽÍNÃ0„'‰›æ¯^<5E>»Ÿq0‰,9vd»”¼{ ¬»*KÞ<4B>ogV'´„S³†¸XÐO:ŽÁ,Éx ¶êCÛˆòí}@oUÔANÁX—dræ:ËÑ»/½ú€“7VêïÔ˜Hžo*‘ýDc

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,2 @@
mschŒKà CͯE=
ž§Ê<EFBFBD>B%

View File

@@ -0,0 +1,5 @@
msch
ŚK
Ă0CĺOŇĐEâMŻşpśÁ<C59B>Ně0včő; ń$!„ ł<>Żń <däMJúľ±ěÔ“”s”VĚ»~&<u2U8š`é—d
ŁýHCt„Ţ.I„Wo%ś±u™°pě$a—¬ż“
Î(üÖÂŔhyłN˝ó

Binary file not shown.

View File

@@ -0,0 +1 @@
mschxś5PŃŽ„ @ôáľÄ/şÜ<C59F>Ë,‰ŠAÝËýýµt5!C§Ó™"FŚÝ6Ż î<>ĄĆĆg:bÍű™ËŔ-ó#-ô÷ŹĂ׾ĄkťĎ§gÍËËöNĄbŚeßSť~g˘o/WËu&jć3­ÓQ®yNt`Đ>­ `ů®™TźŞőŚTťôş»j=Ëë>rĹw“A`€Öč%˛IĎQ V*Ĺ˝6ĐË€—Ď<1D>fĄ'Ć0Đ6LZ^Âs0™3ée®™y1 b$=Hz<48>Ř Ę ĘAž2đo°6´†‰ <©ţ/_&

View File

@@ -0,0 +1,2 @@
mschxœ=벓0 å(=¾à³8þà@t¢jöôÉ<C3B4>qjqmÂq(|Ù—µ<C2B5>â|˜ºQ㼘ñjõ¨­æÛ5è¥wæêÍ<8ÙîUÛñç/5òÿ]õkç½v÷Övݢ];8c-š[ÇR«ß¼ëz?;(ãõØ.óêz<C3AA>¬Ÿ§a5jY)mý|Ó/Þøn2ëØ²üKß©º\¥ÒNó <C3B3>]šÞÝç¯v5C;š7ª”5?%¢ôš#ø¾Ný~øË‘ £ïÌÄ~à¡A!á"މ üð6À_•ræ$åªF”2U#>çœyòÃIÄR. `2'ʼD´=¶çö)¿ÏíùجeÛ“ï×Åö›[¤â]Ðâ„D<E2809E>#C&ÓÝ4”HJVx˜ˆÒHj²ÓŽLZr>;XUD"%(BgÁ$QJ”'™X\åÈïµZæS2ÇÎx¯ª` B“zo:M—½©
¾Uð­p$wI%àÌ“G2ïñ¨Þ¹ A#× Èò€"  PHþŸLo´

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,2 @@
mschxœ%ÐÝrƒ àã˜Üõm:½@³uÌ d“æí»¸^øÁ¸ËYÄÊÕ.„fd—É! ½Ñ6†ùg¿¨œÈmÈ¿\^6R0ôƒ£çâm™è_p9N1­ìñupvæfçÐïë<C3AF>¯ó/3ñ)¸Æ9ÚuÞ3úõIo®ÿôO
\ý$óþNGD=ØÈ¡o\7ïl0»3¼šíi1ßÃH<ëާH¯\(…Fè„E† 5s„\(…Fèîä†YÉdÈÃ

Binary file not shown.

View File

@@ -150,12 +150,18 @@ mod.incompatiblemod = [red]Incompatible
mod.blacklisted = [red]Unsupported mod.blacklisted = [red]Unsupported
mod.unmetdependencies = [red]Unmet Dependencies mod.unmetdependencies = [red]Unmet Dependencies
mod.erroredcontent = [red]Content Errors mod.erroredcontent = [red]Content Errors
mod.circulardependencies = [red]Circular Dependencies
mod.incompletedependencies = [red]Incomplete Dependencies
mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function. mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file. mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it. mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
mod.missingdependencies.details = This mod is missing dependencies: {0} mod.missingdependencies.details = This mod is missing dependencies: {0}
mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them. mod.erroredcontent.details = This mod caused errors when loading. Ask the mod author to fix them.
mod.circulardependencies.details = This mod has dependencies that depends on each other.
mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
mod.requiresversion = Requires game version: [red]{0}
mod.errors = Errors have occurred loading content. mod.errors = Errors have occurred loading content.
mod.noerrorplay = [red]You have mods with errors.[] Either disable the affected mods or fix the errors before playing. mod.noerrorplay = [red]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
@@ -290,6 +296,7 @@ server.invalidport = Invalid port number!
server.error = [scarlet]Error hosting server. server.error = [scarlet]Error hosting server.
save.new = New Save save.new = New Save
save.overwrite = Are you sure you want to overwrite\nthis save slot? save.overwrite = Are you sure you want to overwrite\nthis save slot?
save.nocampaign = Individual save files from the campaign cannot be imported.
overwrite = Overwrite overwrite = Overwrite
save.none = No saves found! save.none = No saves found!
savefail = Failed to save game! savefail = Failed to save game!
@@ -332,6 +339,7 @@ command.repair = Repair
command.rebuild = Rebuild command.rebuild = Rebuild
command.assist = Assist Player command.assist = Assist Player
command.move = Move command.move = Move
command.boost = Boost
openlink = Open Link openlink = Open Link
copylink = Copy Link copylink = Copy Link
back = Back back = Back
@@ -357,6 +365,8 @@ pausebuilding = [accent][[{0}][] to pause building
resumebuilding = [scarlet][[{0}][] to resume building resumebuilding = [scarlet][[{0}][] to resume building
enablebuilding = [scarlet][[{0}][] to enable 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.
commandmode.name = [accent]Command Mode
commandmode.nounits = [no units]
wave = [accent]Wave {0} wave = [accent]Wave {0}
wave.cap = [accent]Wave {0}/{1} wave.cap = [accent]Wave {0}/{1}
wave.waiting = [lightgray]Wave in {0} wave.waiting = [lightgray]Wave in {0}
@@ -441,6 +451,7 @@ waves.max = max units
waves.guardian = Guardian waves.guardian = Guardian
waves.preview = Preview waves.preview = Preview
waves.edit = Edit... waves.edit = Edit...
waves.random = Random
waves.copy = Copy to Clipboard waves.copy = Copy to Clipboard
waves.load = Load from Clipboard waves.load = Load from Clipboard
waves.invalid = Invalid waves in clipboard. waves.invalid = Invalid waves in clipboard.
@@ -451,6 +462,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin waves.sort.begin = Begin
waves.sort.health = Health waves.sort.health = Health
waves.sort.type = Type waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All waves.units.hide = Hide All
waves.units.show = Show All waves.units.show = Show All
@@ -645,7 +658,7 @@ objective.destroycore = [accent]Destroy Enemy Core
objective.command = [accent]Command Units objective.command = [accent]Command Units
objective.nuclearlaunch = [accent]\u26A0 Nuclear launch detected: [lightgray]{0} objective.nuclearlaunch = [accent]\u26A0 Nuclear launch detected: [lightgray]{0}
announce.nuclearstrike = [red]\u26A0 NUCLEAR STRIKE INBOUND \u26A0 announce.nuclearstrike = [red]\u26A0 NUCLEAR STRIKE INBOUND \u26A0\n[lightgray]construct backup cores immediately
loadout = Loadout loadout = Loadout
resources = Resources resources = Resources
@@ -681,6 +694,9 @@ weather.sandstorm.name = Sandstorm
weather.sporestorm.name = Sporestorm weather.sporestorm.name = Sporestorm
weather.fog.name = Fog weather.fog.name = Fog
campaign.playtime = \uF129 [lightgray]Sector Playtime: {0}
campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
sectorlist = Sectors sectorlist = Sectors
sectorlist.attacked = {0} under attack sectorlist.attacked = {0} under attack
sectors.unexplored = [lightgray]Unexplored sectors.unexplored = [lightgray]Unexplored
@@ -764,6 +780,8 @@ sector.windsweptIslands.description = Further past the shoreline is this remote
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.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.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. 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.
sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
sector.onset.name = The Onset sector.onset.name = The Onset
sector.aegis.name = Aegis sector.aegis.name = Aegis
@@ -783,20 +801,22 @@ sector.crossroads.name = Crossroads
sector.karst.name = Karst sector.karst.name = Karst
sector.origin.name = Origin sector.origin.name = Origin
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information. sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area. sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible. sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain. sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[]. sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past certain enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech. sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold. sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect a variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets. sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
sector.ravine.description = An important transportation route for the enemy. No cores detected in the sector, but expect a variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation. sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets. sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival. sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact. sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered. sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase[]. sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores. sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
status.burning.name = Burning status.burning.name = Burning
@@ -882,6 +902,7 @@ stat.repairspeed = Repair Speed
stat.weapons = Weapons stat.weapons = Weapons
stat.bullet = Bullet stat.bullet = Bullet
stat.moduletier = Module Tier stat.moduletier = Module Tier
stat.unittype = Unit Type
stat.speedincrease = Speed Increase stat.speedincrease = Speed Increase
stat.range = Range stat.range = Range
stat.drilltier = Drillables stat.drilltier = Drillables
@@ -934,6 +955,7 @@ ability.unitspawn = {0} Factory
ability.shieldregenfield = Shield Regen Field ability.shieldregenfield = Shield Regen Field
ability.movelightning = Movement Lightning ability.movelightning = Movement Lightning
ability.shieldarc = Shield Arc ability.shieldarc = Shield Arc
ability.suppressionfield = Repair Suppression Field
ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets
bar.onlycoredeposit = Only Core Depositing Allowed bar.onlycoredeposit = Only Core Depositing Allowed
@@ -970,10 +992,12 @@ bar.strength = [stat]{0}[lightgray]x strength
units.processorcontrol = [lightgray]Processor Controlled units.processorcontrol = [lightgray]Processor Controlled
bullet.damage = [stat]{0}[lightgray] damage bullet.damage = [stat]{0}[lightgray] damage
bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles bullet.splashdamage = [stat]{0}[lightgray] area dmg ~ [stat]{1}[lightgray] tiles
bullet.incendiary = [stat]incendiary bullet.incendiary = [stat]incendiary
bullet.homing = [stat]homing bullet.homing = [stat]homing
bullet.armorpierce = [stat]armor piercing bullet.armorpierce = [stat]armor piercing
bullet.suppression = [stat]{0}[lightgray] seconds of repair suppression ~ [stat]{1}[lightgray] tiles
bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
bullet.frags = [stat]{0}[lightgray]x frag bullets: bullet.frags = [stat]{0}[lightgray]x frag bullets:
bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
bullet.buildingdamage = [stat]{0}%[lightgray] building damage bullet.buildingdamage = [stat]{0}%[lightgray] building damage
@@ -983,7 +1007,7 @@ bullet.infinitepierce = [stat]pierce
bullet.healpercent = [stat]{0}[lightgray]% repair bullet.healpercent = [stat]{0}[lightgray]% repair
bullet.healamount = [stat]{0}[lightgray] direct repair bullet.healamount = [stat]{0}[lightgray] direct repair
bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
bullet.reload = [stat]{0}[lightgray]x fire rate bullet.reload = [stat]{0}%[lightgray] fire rate
bullet.range = [stat]{0}[lightgray] tiles range bullet.range = [stat]{0}[lightgray] tiles range
unit.blocks = blocks unit.blocks = blocks
@@ -1087,8 +1111,8 @@ 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 setting.showweather.name = Show Weather Graphics
setting.hidedisplays.name = Hide Logic Displays setting.hidedisplays.name = Hide Logic Displays
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. steam.friendsonly = Friends Only
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[]? steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
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
@@ -1140,7 +1164,8 @@ keybind.select.name = Select/Shoot
keybind.diagonal_placement.name = Diagonal Placement keybind.diagonal_placement.name = Diagonal Placement
keybind.pick.name = Pick Block keybind.pick.name = Pick Block
keybind.break_block.name = Break Block keybind.break_block.name = Break Block
keybind.select_all_units = Select All Units keybind.select_all_units.name = Select All Units
keybind.select_all_unit_factories.name = Select All Unit Factories
keybind.deselect.name = Deselect keybind.deselect.name = Deselect
keybind.pickupCargo.name = Pickup Cargo keybind.pickupCargo.name = Pickup Cargo
keybind.dropCargo.name = Drop Cargo keybind.dropCargo.name = Drop Cargo
@@ -1187,6 +1212,8 @@ rules.wavetimer = Wave Timer
rules.wavesending = Wave Sending rules.wavesending = Wave Sending
rules.waves = Waves rules.waves = Waves
rules.attack = Attack Mode rules.attack = Attack Mode
rules.buildai = Base Builder AI
rules.buildaitier = Builder AI Tier
rules.rtsai = RTS AI [red](WIP) rules.rtsai = RTS AI [red](WIP)
rules.rtsminsquadsize = Min Squad Size rules.rtsminsquadsize = Min Squad Size
rules.rtsmaxsquadsize = Max Squad Size rules.rtsmaxsquadsize = Max Squad Size
@@ -1202,6 +1229,7 @@ rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unitcostmultiplier = Unit Cost Multiplier rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Unit Health Multiplier rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap rules.unitcap = Base Unit Cap
@@ -1213,6 +1241,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
rules.buildspeedmultiplier = Build Speed Multiplier rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Waves Wait for Enemies rules.waitForWaveToEnd = Waves Wait for Enemies
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles) rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
rules.unitammo = Units Require Ammo [red](may be removed) rules.unitammo = Units Require Ammo [red](may be removed)
rules.enemyteam = Enemy Team rules.enemyteam = Enemy Team
@@ -1595,6 +1624,7 @@ block.carbon-vent.name = Carbon Vent
block.arkyic-vent.name = Arkyic Vent block.arkyic-vent.name = Arkyic Vent
block.yellow-stone-vent.name = Yellow Stone Vent block.yellow-stone-vent.name = Yellow Stone Vent
block.red-stone-vent.name = Red Stone Vent block.red-stone-vent.name = Red Stone Vent
block.crystalline-vent.name = Crystalline Vent
block.redmat.name = Redmat block.redmat.name = Redmat
block.bluemat.name = Bluemat block.bluemat.name = Bluemat
block.core-zone.name = Core Zone block.core-zone.name = Core Zone
@@ -1747,7 +1777,6 @@ hint.depositItems = To transfer items, drag from your ship to the core.
hint.respawn = To respawn as a ship, press [accent][[V][]. hint.respawn = To respawn as a ship, press [accent][[V][].
hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[] hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
hint.desktopPause = Press [accent][[Space][] to pause and unpause the game. hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
hint.breaking = [accent]Right-click[] and drag to break blocks. hint.breaking = [accent]Right-click[] and drag to break blocks.
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. 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.
hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right. hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
@@ -1761,6 +1790,8 @@ hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] b
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 = 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.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.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.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path. 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.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.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
@@ -1771,57 +1802,57 @@ hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a pay
hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. 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.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.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 \u00EF\u00A1\u00A8 [accent]Foundation[] core over the \u00EF\u00A1\u00A9 [accent]Shard[] core. Make sure it is free from nearby obstructions. hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uF868 [accent]Foundation[] core over the \uF869 [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.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.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation. hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
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.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there. hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there. hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining. gz.mine = Move near the \uF8C4 [accent]copper ore[] on the ground and click to begin mining.
gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining. gz.mine.mobile = Move near the \uF8C4 [accent]copper ore[] on the ground and tap it to begin mining.
gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it. gz.research = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \uE800 [accent]checkmark[] at the bottom right to confirm. gz.research.mobile = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \uE800 [accent]checkmark[] at the bottom right to confirm.
gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. gz.conveyors = Research and place \uF896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors. gz.conveyors.mobile = Research and place \uF896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper. gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead. gz.lead = \uF837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
gz.moveup = \ue804 Move up for further objectives. gz.moveup = \uE804 Move up for further objectives.
gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors. gz.turrets = Research and place 2 \uF861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uF838 [accent]ammo[] from conveyors.
gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors. gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets. gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uF8AE [accent]copper walls[] around the turrets.
gz.defend = Enemy incoming, prepare to defend. gz.defend = Enemy incoming, prepare to defend.
gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo. gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uF860 [accent]Scatter[] turrets provide excellent anti-air, but require \uF837 [accent]lead[] as ammo.
gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors. gz.scatterammo = Supply the Scatter turret with \uF837 [accent]lead[], using conveyors.
gz.supplyturret = [accent]Supply Turret gz.supplyturret = [accent]Supply Turret
gz.zone1 = This is the enemy drop zone. gz.zone1 = This is the enemy drop zone.
gz.zone2 = Anything built in the radius is destroyed when a wave starts. gz.zone2 = Anything built in the radius is destroyed when a wave starts.
gz.zone3 = A wave will begin now.\nGet ready. gz.zone3 = A wave will begin now.\nGet ready.
gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[]. gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move. onset.mine = Click to mine \uF748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls. onset.mine.mobile = Tap to mine \uF748 [accent]beryllium[] from walls.
onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[]. onset.research = Open the \uE875 tech tree.\nResearch, then place a \uF73E [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls. onset.bore = Research and place a \uF741 [accent]plasma bore[].\nThis automatically mines resources from walls.
onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore. onset.power = To [accent]power[] the plasma bore, research and place a \uF73D [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate. onset.ducts = Research and place \uF799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts. onset.ducts.mobile = Research and place \uF799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium. onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite. onset.graphite = More complex blocks require \uF835 [accent]graphite[].\nSet up plasma bores to mine graphite.
onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[]. onset.research2 = Begin researching [accent]factories[].\nResearch the \uF74D [accent]cliff crusher[] and \uF779 [accent]silicon arc furnace[].
onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required. onset.arcfurnace = The arc furnace needs \uF834 [accent]sand[] and \uF835 [accent]graphite[] to create \uF82F [accent]silicon[].\n[accent]Power[] is also required.
onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand. onset.crusher = Use \uF74D [accent]cliff crushers[] to mine sand.
onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[]. onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uF6A2 [accent]tank fabricator[].
onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements. onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[]. onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uF6EB [accent]Breach[] turret.\nTurrets require \uF748 [accent]ammo[].
onset.turretammo = Supply the turret with [accent]beryllium ammo.[] onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret. onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uF6EE [accent]beryllium walls[] around the turret.
onset.enemies = Enemy incoming, prepare to defend. onset.enemies = Enemy incoming, prepare to defend.
onset.attack = The enemy is vulnerable. Counter-attack. onset.attack = The enemy is vulnerable. Counter-attack.
onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core. onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uF725 core.
onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production. onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop) split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [[ and ] to pick up and drop)
split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.) split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
split.acquire = You must acquire some tungsten to build units. split.acquire = You must acquire some tungsten to build units.
split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other. split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
@@ -2110,9 +2141,11 @@ block.small-deconstructor.description = Deconstructs inputted structures and uni
block.reinforced-payload-conveyor.description = Moves payloads forward. block.reinforced-payload-conveyor.description = Moves payloads forward.
block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set. block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers. block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone. block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power. block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen. block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
unit.dagger.description = Fires standard bullets at enemy targets. unit.dagger.description = Fires standard bullets at enemy targets.
unit.mace.description = Fires streams of flame at enemy targets. unit.mace.description = Fires streams of flame at enemy targets.
@@ -2208,6 +2241,7 @@ lst.flushmessage = Display a message on the screen from the text buffer.\nWill w
lst.cutscene = Manipulate the player camera. lst.cutscene = Manipulate the player camera.
lst.setflag = Set a global flag that can be read by all processors. lst.setflag = Set a global flag that can be read by all processors.
lst.getflag = Check if a global flag is set. lst.getflag = Check if a global flag is set.
lst.setprop = Sets a property of a unit or building.
logic.nounitbuild = [red]Unit building logic is not allowed here. logic.nounitbuild = [red]Unit building logic is not allowed here.
@@ -2342,7 +2376,7 @@ lenum.stop = Stop moving/mining/building.
lenum.unbind = Completely disable logic control.\nResume standard AI. lenum.unbind = Completely disable logic control.\nResume standard AI.
lenum.move = Move to exact position. lenum.move = Move to exact position.
lenum.approach = Approach a position with a radius. lenum.approach = Approach a position with a radius.
lenum.pathfind = Pathfind to the enemy spawn. lenum.pathfind = Pathfind to the specified position.
lenum.target = Shoot a position. lenum.target = Shoot a position.
lenum.targetp = Shoot a target with velocity prediction. lenum.targetp = Shoot a target with velocity prediction.
lenum.itemdrop = Drop an item. lenum.itemdrop = Drop an item.

File diff suppressed because it is too large Load Diff

View File

@@ -149,11 +149,16 @@ mod.incompatiblemod = [red]Incompatible
mod.blacklisted = [red]Unsupported mod.blacklisted = [red]Unsupported
mod.unmetdependencies = [red]Unmet Dependencies mod.unmetdependencies = [red]Unmet Dependencies
mod.erroredcontent = [scarlet]Грешки в Съдържанието mod.erroredcontent = [scarlet]Грешки в Съдържанието
mod.circulardependencies = [red]Circular Dependencies
mod.incompletedependencies = [red]Incomplete Dependencies
mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function. mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file. mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it. mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
mod.missingdependencies.details = This mod is missing dependencies: {0} mod.missingdependencies.details = This mod is missing dependencies: {0}
mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them. mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
mod.circulardependencies.details = This mod has dependencies that depends on each other.
mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
mod.requiresversion = Requires game version: [red]{0}
mod.errors = Възникнаха грешки при зареждане на съдържанието. mod.errors = Възникнаха грешки при зареждане на съдържанието.
mod.noerrorplay = [scarlet]Има грешки в някои от модовете, които използвате.[] Трябва да деактивирате тези модове или да поправите грешките преди да играете. mod.noerrorplay = [scarlet]Има грешки в някои от модовете, които използвате.[] Трябва да деактивирате тези модове или да поправите грешките преди да играете.
mod.nowdisabled = [scarlet]Липсват зависимости за мод '{0}':[accent] {1}\n[lightgray]Мод {0} ще бъде деактивиран докато не ги изтеглите. mod.nowdisabled = [scarlet]Липсват зависимости за мод '{0}':[accent] {1}\n[lightgray]Мод {0} ще бъде деактивиран докато не ги изтеглите.
@@ -287,6 +292,7 @@ server.invalidport = Невалиден порт!
server.error = [scarlet]Грешка при стартиране на сървър. server.error = [scarlet]Грешка при стартиране на сървър.
save.new = Нов Запис save.new = Нов Запис
save.overwrite = Сигурни ли сте, че искате\nда презапишете тази позиция за запиз? save.overwrite = Сигурни ли сте, че искате\nда презапишете тази позиция за запиз?
save.nocampaign = Individual save files from the campaign cannot be imported.
overwrite = Презапиши overwrite = Презапиши
save.none = Не са намерени записи! save.none = Не са намерени записи!
savefail = Грешка при записване на игра! savefail = Грешка при записване на игра!
@@ -329,6 +335,7 @@ command.repair = Repair
command.rebuild = Rebuild command.rebuild = Rebuild
command.assist = Assist Player command.assist = Assist Player
command.move = Move command.move = Move
command.boost = Boost
openlink = Отвори Линк openlink = Отвори Линк
copylink = Копирай Линк copylink = Копирай Линк
back = Назад back = Назад
@@ -354,6 +361,8 @@ pausebuilding = [accent][[{0}][] за да Отложите на Строежа
resumebuilding = [scarlet][[{0}][] за да Продължите Строежа resumebuilding = [scarlet][[{0}][] за да Продължите Строежа
enablebuilding = [scarlet][[{0}][] за да Позволите Строенето enablebuilding = [scarlet][[{0}][] за да Позволите Строенето
showui = Интерфейсът е скрит.\nНатиснете [accent][[{0}][] за да го покажете. showui = Интерфейсът е скрит.\nНатиснете [accent][[{0}][] за да го покажете.
commandmode.name = [accent]Command Mode
commandmode.nounits = [no units]
wave = [accent]Вълна {0} wave = [accent]Вълна {0}
wave.cap = [accent]Вълна {0}/{1} wave.cap = [accent]Вълна {0}/{1}
wave.waiting = [lightgray]Вълна след {0} wave.waiting = [lightgray]Вълна след {0}
@@ -438,6 +447,7 @@ waves.max = max units
waves.guardian = Пазител waves.guardian = Пазител
waves.preview = Преглед waves.preview = Преглед
waves.edit = Редактирай... waves.edit = Редактирай...
waves.random = Random
waves.copy = Кобирай в Клипборд waves.copy = Кобирай в Клипборд
waves.load = Зареди от Клипборда waves.load = Зареди от Клипборда
waves.invalid = Клипборда съдържа невалидна информация за вълни. waves.invalid = Клипборда съдържа невалидна информация за вълни.
@@ -448,6 +458,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin waves.sort.begin = Begin
waves.sort.health = Health waves.sort.health = Health
waves.sort.type = Type waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All waves.units.hide = Hide All
waves.units.show = Show All waves.units.show = Show All
@@ -669,6 +681,8 @@ weather.snow.name = Сняг
weather.sandstorm.name = Пясъчна буря weather.sandstorm.name = Пясъчна буря
weather.sporestorm.name = Спорова буря weather.sporestorm.name = Спорова буря
weather.fog.name = Мъгла weather.fog.name = Мъгла
campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
sectorlist = Sectors sectorlist = Sectors
sectorlist.attacked = {0} under attack sectorlist.attacked = {0} under attack
@@ -753,6 +767,8 @@ sector.windsweptIslands.description = По - нататък край брего
sector.extractionOutpost.description = Отдалечен аванпост, където врагът е разследвал технологии за пренасяне на ресурси на далечни растояния.\n\nТехнологии за транспорт на материали между зони е ключова за бъдещи действия. Унищожете вражеската база и проучете вражеските Изстрелващи площадки. sector.extractionOutpost.description = Отдалечен аванпост, където врагът е разследвал технологии за пренасяне на ресурси на далечни растояния.\n\nТехнологии за транспорт на материали между зони е ключова за бъдещи действия. Унищожете вражеската база и проучете вражеските Изстрелващи площадки.
sector.impact0078.description = Тук лежат останките от първия междузвезден транспортер, влязъл в тази система.\n\nСпасете колкото е възможно повече от останките. Проучете всяка непокътната технология. sector.impact0078.description = Тук лежат останките от първия междузвезден транспортер, влязъл в тази система.\n\nСпасете колкото е възможно повече от останките. Проучете всяка непокътната технология.
sector.planetaryTerminal.description = Крайна цел.\n\nТази крайбрежна база съдържа структура, създадена с цел междупланетарен транспорт на ядра, макар и само в рамките на локалната звездна система. Тази локация има изключително висока защита.\n\nИзползвайте военноморски единици. Елиминирайте врага възможно най - бързо. Проучете изстрелващата структура sector.planetaryTerminal.description = Крайна цел.\n\nТази крайбрежна база съдържа структура, създадена с цел междупланетарен транспорт на ядра, макар и само в рамките на локалната звездна система. Тази локация има изключително висока защита.\n\nИзползвайте военноморски единици. Елиминирайте врага възможно най - бързо. Проучете изстрелващата структура
sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
sector.onset.name = The Onset sector.onset.name = The Onset
sector.aegis.name = Aegis sector.aegis.name = Aegis
sector.lake.name = Lake sector.lake.name = Lake
@@ -770,21 +786,24 @@ sector.siege.name = Siege
sector.crossroads.name = Crossroads sector.crossroads.name = Crossroads
sector.karst.name = Karst sector.karst.name = Karst
sector.origin.name = Origin sector.origin.name = Origin
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information. sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible. sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain. sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[]. sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech. sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
sector.basin.description = {Temporary}\n\nThe last sector for now. Consider this a challenge level - more sectors will be added in a later release. sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets. sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
sector.caldera-erekir.description = Temporary description. sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
sector.stronghold.description = WiP Description. sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
sector.crevice.description = WiP Description. sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
sector.siege.description = WiP Description. sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
sector.crossroads.description = WiP Description. sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
sector.karst.description = WiP Description. sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
sector.origin.description = WiP Description. sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
status.burning.name = Горящ status.burning.name = Горящ
status.freezing.name = Замръзяващ status.freezing.name = Замръзяващ
@@ -869,6 +888,7 @@ stat.repairspeed = Repair Speed
stat.weapons = Оръжия stat.weapons = Оръжия
stat.bullet = Муниции stat.bullet = Муниции
stat.moduletier = Module Tier stat.moduletier = Module Tier
stat.unittype = Unit Type
stat.speedincrease = Ускорение stat.speedincrease = Ускорение
stat.range = Обхват stat.range = Обхват
stat.drilltier = Изкопаеми ресурси stat.drilltier = Изкопаеми ресурси
@@ -921,6 +941,7 @@ ability.unitspawn = {0} Factory
ability.shieldregenfield = Възстановяващо броня Поле ability.shieldregenfield = Възстановяващо броня Поле
ability.movelightning = Подвижна светкавица ability.movelightning = Подвижна светкавица
ability.shieldarc = Shield Arc ability.shieldarc = Shield Arc
ability.suppressionfield = Regen Suppression Field
ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets
bar.onlycoredeposit = Only Core Depositing Allowed bar.onlycoredeposit = Only Core Depositing Allowed
@@ -961,6 +982,8 @@ bullet.splashdamage = [stat]{0}[lightgray] щети на площ ~[stat] {1}[li
bullet.incendiary = [stat]Подпалване bullet.incendiary = [stat]Подпалване
bullet.homing = [stat]Самонасочване bullet.homing = [stat]Самонасочване
bullet.armorpierce = [stat]armor piercing bullet.armorpierce = [stat]armor piercing
bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
bullet.frags = [stat]{0}[lightgray]x frag bullets: bullet.frags = [stat]{0}[lightgray]x frag bullets:
bullet.lightning = [stat]{0}[lightgray]x светкавица ~ [stat]{1}[lightgray] щети bullet.lightning = [stat]{0}[lightgray]x светкавица ~ [stat]{1}[lightgray] щети
bullet.buildingdamage = [stat]{0}%[lightgray] щети на сгради bullet.buildingdamage = [stat]{0}%[lightgray] щети на сгради
@@ -1074,8 +1097,8 @@ setting.bridgeopacity.name = Плътност на Мостовете
setting.playerchat.name = Показвай Мехурчета с Чат setting.playerchat.name = Показвай Мехурчета с Чат
setting.showweather.name = Показвай Графики за Климата setting.showweather.name = Показвай Графики за Климата
setting.hidedisplays.name = Hide Logic Displays setting.hidedisplays.name = Hide Logic Displays
public.confirm = Искате ли да направите вашата игра публична?\n[accent]Всеки ще може да се присъедини към вашата игра.\n[lightgray]Това може да бъде променено по-късно в Настройки->Игри->Видимост на Публичните Игри. steam.friendsonly = Friends Only
public.confirm.really = Ако искате да играете с приятел, използвате [green]Покани Приятел[] вместо [scarlet]Публикувай Сървър[]!\nСигурни ли сте, че искате да направите вашата игра [scarlet]публична[]? steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
public.beta = Имайте в предвид, че бета версии на играта не могат да стартират публични игри. public.beta = Имайте в предвид, че бета версии на играта не могат да стартират публични игри.
uiscale.reset = Размерът на интерфейса беше променен.\nНатиснете "ОК" за да потвърдите този размер.\n[scarlet]Възстановяване и рестартиране след[accent] {0}[] секунди... uiscale.reset = Размерът на интерфейса беше променен.\nНатиснете "ОК" за да потвърдите този размер.\n[scarlet]Възстановяване и рестартиране след[accent] {0}[] секунди...
uiscale.cancel = Отакз & Изход uiscale.cancel = Отакз & Изход
@@ -1127,7 +1150,8 @@ keybind.select.name = Избери/Стреляй
keybind.diagonal_placement.name = Диагонално Поставяне keybind.diagonal_placement.name = Диагонално Поставяне
keybind.pick.name = Вземи Блок keybind.pick.name = Вземи Блок
keybind.break_block.name = Унищожи Блок keybind.break_block.name = Унищожи Блок
keybind.select_all_units = Select All Units keybind.select_all_units.name = Select All Units
keybind.select_all_unit_factories.name = Select All Unit Factories
keybind.deselect.name = Премахни избора keybind.deselect.name = Премахни избора
keybind.pickupCargo.name = Вземи Товар keybind.pickupCargo.name = Вземи Товар
keybind.dropCargo.name = Остави Товар keybind.dropCargo.name = Остави Товар
@@ -1174,6 +1198,8 @@ rules.wavetimer = Таймер за Вълни
rules.wavesending = Wave Sending rules.wavesending = Wave Sending
rules.waves = Вълни rules.waves = Вълни
rules.attack = Режим Атака rules.attack = Режим Атака
rules.buildai = Base Builder AI
rules.buildaitier = Builder AI Tier
rules.rtsai = RTS AI rules.rtsai = RTS AI
rules.rtsminsquadsize = Min Squad Size rules.rtsminsquadsize = Min Squad Size
rules.rtsmaxsquadsize = Max Squad Size rules.rtsmaxsquadsize = Max Squad Size
@@ -1189,6 +1215,7 @@ rules.unitbuildspeedmultiplier = Множител на Скоростта на
rules.unitcostmultiplier = Unit Cost Multiplier rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Множител на Точките Живот на Единици rules.unithealthmultiplier = Множител на Точките Живот на Единици
rules.unitdamagemultiplier = Множител на Щетите на Единици rules.unitdamagemultiplier = Множител на Щетите на Единици
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Ядрата Увеличават Максималния Брой Единици rules.unitcapvariable = Ядрата Увеличават Максималния Брой Единици
rules.unitcap = Максимален Брой Единици rules.unitcap = Максимален Брой Единици
@@ -1200,6 +1227,7 @@ rules.buildcostmultiplier = Множител на Необходимите Ре
rules.buildspeedmultiplier = Множител на Скоростта за Строене rules.buildspeedmultiplier = Множител на Скоростта за Строене
rules.deconstructrefundmultiplier = Множител на Възстановени Ресурси при Деконструкция rules.deconstructrefundmultiplier = Множител на Възстановени Ресурси при Деконструкция
rules.waitForWaveToEnd = Вълните Изчакват за Врагове rules.waitForWaveToEnd = Вълните Изчакват за Врагове
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Радиус на Начална Точка на Враговете:[lightgray] (полета) rules.dropzoneradius = Радиус на Начална Точка на Враговете:[lightgray] (полета)
rules.unitammo = Единиците се Нуждаят от Боеприпаси rules.unitammo = Единиците се Нуждаят от Боеприпаси
rules.enemyteam = Enemy Team rules.enemyteam = Enemy Team
@@ -1576,6 +1604,7 @@ block.carbon-vent.name = Carbon Vent
block.arkyic-vent.name = Arkyic Vent block.arkyic-vent.name = Arkyic Vent
block.yellow-stone-vent.name = Yellow Stone Vent block.yellow-stone-vent.name = Yellow Stone Vent
block.red-stone-vent.name = Red Stone Vent block.red-stone-vent.name = Red Stone Vent
block.crystalline-vent.name = Crystalline Vent
block.redmat.name = Redmat block.redmat.name = Redmat
block.bluemat.name = Bluemat block.bluemat.name = Bluemat
block.core-zone.name = Core Zone block.core-zone.name = Core Zone
@@ -1741,6 +1770,8 @@ hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] b
hint.launch = След като съберете достатъчно ресурси, можете да [accent]Изстреляте[] ядро като изберете близък сектор от \ue827 [accent]Глобуса[] в долния десен ъгъл. hint.launch = След като съберете достатъчно ресурси, можете да [accent]Изстреляте[] ядро като изберете близък сектор от \ue827 [accent]Глобуса[] в долния десен ъгъл.
hint.launch.mobile = След като съберете достатъчно ресурси, можете да [accent]Изстреляте[] ядро като изберете близък сектор от \ue827 [accent]Глобуса[] в \ue88c [accent]Менюто[]. hint.launch.mobile = След като съберете достатъчно ресурси, можете да [accent]Изстреляте[] ядро като изберете близък сектор от \ue827 [accent]Глобуса[] в \ue88c [accent]Менюто[].
hint.schematicSelect = Задръжте [accent][[F][] и плъзнете за да изберете/копирате група от блокчета.\n\n[accent][[Среден клик][] за да копирате едно блокче. hint.schematicSelect = Задръжте [accent][[F][] и плъзнете за да изберете/копирате група от блокчета.\n\n[accent][[Среден клик][] за да копирате едно блокче.
hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
hint.conveyorPathfind = Задръжте [accent][[L-Ctrl][] докато поставяте пътека от конвейери за да генерирате пътека автоматично. hint.conveyorPathfind = Задръжте [accent][[L-Ctrl][] докато поставяте пътека от конвейери за да генерирате пътека автоматично.
hint.conveyorPathfind.mobile = Позволете \ue844 [accent]Диагонално Поставяне[] за автоматично намиране на пътека при поставяне на конвейери. hint.conveyorPathfind.mobile = Позволете \ue844 [accent]Диагонално Поставяне[] за автоматично намиране на пътека при поставяне на конвейери.
hint.boost = Задръжте [accent][[L-Shift][] за да прелетите над препятствия с тази единица.\n\nСамо някои наземни единици имат двигатели за летене. hint.boost = Задръжте [accent][[L-Shift][] за да прелетите над препятствия с тази единица.\n\nСамо някои наземни единици имат двигатели за летене.
@@ -2080,9 +2111,11 @@ block.small-deconstructor.description = Deconstructs inputted structures and uni
block.reinforced-payload-conveyor.description = Moves payloads forward. block.reinforced-payload-conveyor.description = Moves payloads forward.
block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set. block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers. block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone. block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power. block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen. block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
unit.dagger.description = Изстрелва стандартни боеприпаси по всички близки врагове. unit.dagger.description = Изстрелва стандартни боеприпаси по всички близки врагове.
unit.mace.description = Изстрелва поток от пламък по всички близки врагове. unit.mace.description = Изстрелва поток от пламък по всички близки врагове.
@@ -2176,6 +2209,7 @@ lst.flushmessage = Display a message on the screen from the text buffer.\nWill w
lst.cutscene = Manipulate the player camera. lst.cutscene = Manipulate the player camera.
lst.setflag = Set a global flag that can be read by all processors. lst.setflag = Set a global flag that can be read by all processors.
lst.getflag = Check if a global flag is set. lst.getflag = Check if a global flag is set.
lst.setprop = Sets a property of a unit or building.
logic.nounitbuild = [red]Действия за строене на единици не са позволени тук. logic.nounitbuild = [red]Действия за строене на единици не са позволени тук.

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