From bb06c3f1e916c2fd8c88d85912882aae3fb1f2b7 Mon Sep 17 00:00:00 2001
From: JniTrRny <85090668+JniTrRny@users.noreply.github.com>
Date: Sun, 7 May 2023 10:04:31 +0700
Subject: [PATCH 1/7] Wave limit game rule in custom maps (#8550)

* custom maps wave limit

* whoopsies
---
 core/assets/bundles/bundle.properties         |  1 +
 core/src/mindustry/core/Logic.java            |  3 +++
 core/src/mindustry/game/Rules.java            |  2 +-
 .../ui/dialogs/CustomRulesDialog.java         | 24 +++++++++++--------
 core/src/mindustry/ui/dialogs/LoadDialog.java | 10 ++++----
 .../ui/dialogs/SchematicsDialog.java          |  2 +-
 .../mindustry/ui/fragments/HudFragment.java   |  4 ++--
 7 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index ae3ed511c7..e4111913e4 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1237,6 +1237,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves Wait for Enemies
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo [red](may be removed)
 rules.enemyteam = Enemy Team
diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index 22bc9259d0..bde8089da8 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -310,6 +310,9 @@ public class Logic implements ApplicationListener{
                     Events.fire(new GameOverEvent(left == null ? Team.derelict : left.team));
                     state.gameOver = true;
                 }
+            }else if(!state.gameOver && state.rules.waves && (state.enemies == 0 && state.rules.winWave > 0 && state.wave >= state.rules.winWave && !spawner.isSpawning())){
+                state.gameOver = true;
+                Events.fire(new GameOverEvent(state.rules.defaultTeam));
             }
         }
     }
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index 08a97351da..f6445db9ec 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -113,7 +113,7 @@ public class Rules{
     public float waveSpacing = 2 * Time.toMinutes;
     /** Starting wave spacing; if <=0, uses waveSpacing * 2. */
     public float initialWaveSpacing = 0f;
-    /** Wave after which the player 'wins'. Used in sectors. Use a value <= 0 to disable. */
+    /** Wave after which the player 'wins'. Use a value <= 0 to disable. */
     public int winWave = 0;
     /** Base unit cap. Can still be increased by blocks. */
     public int unitCap = 0;
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index 4d308c5cf2..4f35ae48ac 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -68,7 +68,7 @@ public class CustomRulesDialog extends BaseDialog{
                         b.image(con.uiIcon).size(iconMed).padRight(3);
                         b.add(con.localizedName).color(Color.lightGray).padLeft(3).growX().left().wrap();
 
-                        b.button(Icon.cancel, Styles.clearNonei, () -> {
+                        b.button(Icon.cancel, Styles.emptyi, () -> {
                             set.remove(con);
                             rebuild[0].run();
                         }).size(70f).pad(-4f).padLeft(0f);
@@ -91,7 +91,7 @@ public class CustomRulesDialog extends BaseDialog{
                             set.add(b);
                             rebuild[0].run();
                             dialog.hide();
-                        }).size(60f);
+                        }).size(60f).tooltip(b.localizedName);
 
                         if(++i[0] % cols == 0){
                             t.row();
@@ -101,7 +101,7 @@ public class CustomRulesDialog extends BaseDialog{
 
                 dialog.addCloseButton();
                 dialog.show();
-            }).size(300f, 64f);
+            }).size(300f, 64f).disabled(b -> set.size == content.<T>getBy(type).count(pred));
         };
 
         bd.shown(rebuild[0]);
@@ -139,15 +139,16 @@ public class CustomRulesDialog extends BaseDialog{
 
         title("@rules.title.waves");
         check("@rules.waves", b -> rules.waves = b, () -> rules.waves);
-        check("@rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer);
-        check("@rules.wavesending", b -> rules.waveSending = b, () -> rules.waveSending);
-        check("@rules.waitForWaveToEnd", b -> rules.waitEnemies = b, () -> rules.waitEnemies);
-        number("@rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> rules.waveTimer, 1, Float.MAX_VALUE);
+        check("@rules.wavesending", b -> rules.waveSending = b, () -> rules.waveSending, () -> rules.waves);
+        check("@rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer, () -> rules.waves);
+        check("@rules.waitForWaveToEnd", b -> rules.waitEnemies = b, () -> rules.waitEnemies, () -> rules.waves && rules.waveTimer);
+        numberi("@rules.wavelimit", f -> rules.winWave = f, () -> rules.winWave, () -> rules.waves, 0, Integer.MAX_VALUE);
+        number("@rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> rules.waves && rules.waveTimer, 1, Float.MAX_VALUE);
         //this is experimental, because it's not clear that 0 makes it default.
         if(experimental){
-            number("@rules.initialwavespacing", false, f -> rules.initialWaveSpacing = f * 60f, () -> rules.initialWaveSpacing / 60f, () -> true, 0, Float.MAX_VALUE);
+            number("@rules.initialwavespacing", false, f -> rules.initialWaveSpacing = f * 60f, () -> rules.initialWaveSpacing / 60f, () -> rules.waves && rules.waveTimer, 0, Float.MAX_VALUE);
         }
-        number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> true);
+        number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> rules.waves);
 
         title("@rules.title.resourcesbuilding");
         check("@rules.infiniteresources", b -> {
@@ -281,7 +282,10 @@ public class CustomRulesDialog extends BaseDialog{
 
             main.button("[#" + team.color +  "]" + team.localized() + (team.emoji.isEmpty() ? "" : "[] " + team.emoji), Icon.downOpen, Styles.togglet, () -> {
                 shown[0] = !shown[0];
-            }).marginLeft(14f).width(260f).height(55f).checked(a -> shown[0]).row();
+            }).marginLeft(14f).width(260f).height(55f).update(t -> {
+                ((Image)t.getChildren().get(1)).setDrawable(shown[0] ? Icon.upOpen : Icon.downOpen);
+                t.setChecked(shown[0]);
+            }).row();
 
             main.collapser(t -> {
                 t.left().defaults().fillX().left().pad(5);
diff --git a/core/src/mindustry/ui/dialogs/LoadDialog.java b/core/src/mindustry/ui/dialogs/LoadDialog.java
index cc0ca264c0..8c4118db4e 100644
--- a/core/src/mindustry/ui/dialogs/LoadDialog.java
+++ b/core/src/mindustry/ui/dialogs/LoadDialog.java
@@ -24,7 +24,7 @@ import static mindustry.Vars.*;
 public class LoadDialog extends BaseDialog{
     Table slots;
     String searchString;
-    Seq<Gamemode> filteredModes;
+    Seq<Gamemode> hidden;
     TextField searchField;
     ScrollPane pane;
 
@@ -50,7 +50,7 @@ public class LoadDialog extends BaseDialog{
         cont.clear();
 
         slots = new Table();
-        filteredModes = new Seq<>();
+        hidden = new Seq<>();
         pane = new ScrollPane(slots);
 
         rebuild();
@@ -67,9 +67,9 @@ public class LoadDialog extends BaseDialog{
             boolean sandbox = mode == Gamemode.sandbox;
             if(Core.atlas.isFound(icon.getRegion()) || sandbox){
                 search.button(sandbox ? Icon.terrain : icon, Styles.emptyTogglei, () -> {
-                    if(!filteredModes.addUnique(mode)) filteredModes.remove(mode);
+                    if(!hidden.addUnique(mode)) hidden.remove(mode);
                     rebuild();
-                }).size(60f).padLeft(-8f).checked(b -> !filteredModes.contains(mode)).tooltip("@mode." + mode.name() + ".name");
+                }).size(60f).padLeft(-12f).checked(b -> !hidden.contains(mode)).tooltip("@mode." + mode.name() + ".name");
             }
         }
 
@@ -98,7 +98,7 @@ public class LoadDialog extends BaseDialog{
         for(SaveSlot slot : array){
             if(slot.isHidden()
             || (searchString != null && !Strings.stripColors(slot.getName()).toLowerCase().contains(searchString))
-            || (!filteredModes.isEmpty() && filteredModes.contains(slot.mode()))){
+            || (!hidden.isEmpty() && hidden.contains(slot.mode()))){
                 continue;
             }
 
diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
index 988491b56c..8c945c3018 100644
--- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java
+++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
@@ -725,7 +725,7 @@ public class SchematicsDialog extends BaseDialog{
                     r.image(s.item.uiIcon).left().size(iconMed);
                     r.label(() -> {
                         Building core = player.core();
-                        if(core == null || state.rules.infiniteResources || core.items.has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
+                        if(core == null || state.isMenu() || state.rules.infiniteResources || core.items.has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
                         return (core.items.has(s.item, s.amount) ? "[lightgray]" : "[scarlet]") + Math.min(core.items.get(s.item), s.amount) + "[lightgray]/" + s.amount;
                     }).padLeft(2).left().padRight(4);
 
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index 9652d56ecd..7b8412171e 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -52,7 +52,7 @@ public class HudFragment{
         //warn about guardian/boss waves
         Events.on(WaveEvent.class, e -> {
             int max = 10;
-            int winWave = state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
+            int winWave = state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
             outer:
             for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave - 2); i++){
                 for(SpawnGroup group : state.rules.spawns){
@@ -822,7 +822,7 @@ public class HudFragment{
                 return builder;
             }
 
-            if(state.rules.winWave > 1 && state.rules.winWave >= state.wave && state.isCampaign()){
+            if(state.rules.winWave > 1 && state.rules.winWave >= state.wave){
                 builder.append(wavefc.get(state.wave, state.rules.winWave));
             }else{
                 builder.append(wavef.get(state.wave));

From dbafdfb3123f165df91bf5e4fef54618630bf3e1 Mon Sep 17 00:00:00 2001
From: nullevoy <89076920+stacktrace-error@users.noreply.github.com>
Date: Sun, 7 May 2023 15:38:17 +0200
Subject: [PATCH 2/7] gas sprites (ark too ig) (#8528)

* ?

* this was better

* ghghghghgghghhghghghg

* single pixel changes
---
 .../sprites/items/liquid-arkycite.png           | Bin 502 -> 431 bytes
 .../sprites/items/liquid-cyanogen.png           | Bin 329 -> 304 bytes
 .../sprites/items/liquid-hydrogen.png           | Bin 324 -> 304 bytes
 .../sprites/items/liquid-nitrogen.png           | Bin 308 -> 285 bytes
 core/assets-raw/sprites/items/liquid-ozone.png  | Bin 322 -> 291 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/assets-raw/sprites/items/liquid-arkycite.png b/core/assets-raw/sprites/items/liquid-arkycite.png
index 3a52288354e3fa60ea9a5b97fcc6a901cf3e6681..0ecdd7cc7313070037355ff14d772dfdd00b6281 100644
GIT binary patch
delta 392
zcmV;30eAlP1Fr*+F@I@EL_t(oh2@qlZvsIOhW9R2wU_cIYAc$S3J8Lv0R_R;Hb^|G
z!B^JfYMKiP38D$60zq*66)aUtu5<If0n=CAZ8G~lGdHuhA^dk`)_~dP^ATHrZTC)l
z<@u0|FN(qkKp9gY6od;vYhKm3Ge`G^0Qou0LkQvH`$ZMU0)KeTEf8V_QYAs09YBI$
z0j8s6t&ygqWrnSLrJe%J)Y>EC&OC!taHR=^=9F>&?)K07V!IdjHur$m99zSB!35wL
zOAO2f(44f6tIfgcFG>Z_oV3Kux$j-A0<5A40L{57Xqpa+1<+)k3PA!;=H2^iBN7jV
z0(df~45f;w4u7I3OZM7NQL8{|_Ewn=B5VRyn*%!;Q1DncAH`KO>e(Vw52Tu5y2ynj
z3j3wk0Dj)r?#qU!GNc)th6rYvlIqw}w<tE-Xa=id9aXNXV!6w*3=cQE(|hCb%>?l^
mc*<go3qTSDlF~~T)i1RXl;AmHrmO$}002ovPDHLkU;%<7#<b1=

delta 463
zcmV;=0Wkir1NH-uF@La0L_t(og=1hCV8Dn?@a@~TaQ44{s~KkQ+x#EKPj~Xg(8I(O
ziq{fhVPWzeFnv$le{5>d9fHph_#D85Q-%PTxo`7-<dFIIZ#7xw5OhGM%Ob3ygzONq
zY$nzLq&R|{P#`)AXypj9(*U&`K~)Ek14wcJp=e-WAUzal5`O}u<O~*Uf=~WI^vf_o
zJpA{@M6w+6@84>Ir6krMz4-bKoGp245}X~h=J0<H3oba{&qNzT@1`?X;p}uLUq&XT
zP`o7})(}9qJZQ~fj3C8kIZPbc5ronL&NLu-YZ8N)brXu^$iBx1V2&duEnsy3%;z?R
zjyNqx_9Z0%XMYG_3wCk<p-><y8{!IjYJ>t-2aw`>N*zHk1c*s^o6cNCaR@1n!kZ0A
z1>}Ur;IE8!ocK1d4xkhe@&Hi|AU70<(TCLm>q2ZXDk)MNvE#%yxO!}6Ap??f0nAWb
zS(BWQ!s&o@A-0UT3M67JBIJ7p20Up%%({u;NdJC<21wun#OlQw0>@q(F}ylj2jk)l
z30z=Zh%F;Sh%HfSaYn(h*G3FhqUR6>G7zpKhzasR2LP8rxe4J;Ty6jW002ovPDHLk
FV1nWh$W;IU

diff --git a/core/assets-raw/sprites/items/liquid-cyanogen.png b/core/assets-raw/sprites/items/liquid-cyanogen.png
index 29c204c89db611be56a22410a954b00383e4e7ab..fdb14258ed421800969736b179569e4988923979 100644
GIT binary patch
delta 265
zcmV+k0rvjM0<Z#*Fn<8*Nkl<ZScUDB!41MN3`HH(39=C4kTqB$bFc(!a6pVubq`j6
zQ=}-e8~@s=kmx_<68q)*J4FAk;8EoEetgO~#{|_h1Jup8K$rly<|xR?0?<<rkceo~
zT;^V)DXtOgKwI3a87KH<#SH{%EeqlZBze0rG=v90(c0LCt$&xKHjriqa!djJ|J?xU
z##)Hh;ol2kjw#Fw{5|*q6!joD%Qa(wLO3rI3t|afE4I+}^%Pg}e!g^@ORLO*4+$Z+
znv!cn)20~}Jc3%9aclxWAX=eN?ioPAMF0<bO#pjAKn;5K?&aDcSA7Ac*<869MRX4U
P0000<MNUMnLIPldw_|md

delta 290
zcmV+-0p0$v0?7i9Fn<99Nkl<ZScUDC%?-jZ424_N3AzVj1jM0hutewR60Fe!Vg%GZ
zIssBS1qI{(xF7*f>ZNhwFVAsOReyb0wROTUj|(^6x1DKCb+DA!3nB(t6I(&p!P4X!
z2y!4QxdgGnejYF9(Bzy@ssymx-pGk?M;ga47hZnA-9rejo`0SeMN5$DIyK}1!#pnO
zli(=81`EU>pc8O0@1cEifIEEF8_orwRb-3003!8U0IoJ%TjE8O>$E>S;-j8tw*%U?
z?Axy9Vod<h9d2PMaT5C&QOZkEDpv_2pKEd_+9a48X|Bd8HXvfB5(Ha<$XZiUCGa{?
oTmmnM#W|P76dTApO7?xa18o3#%g<K{hX4Qo07*qoM6N<$f>t+t@Bjb+

diff --git a/core/assets-raw/sprites/items/liquid-hydrogen.png b/core/assets-raw/sprites/items/liquid-hydrogen.png
index cf55930c4249b954d884c03b99cf449c6578bfab..4ec296d9b7ec096be05b33b7b6b369cb0f4d8b94 100644
GIT binary patch
delta 264
zcmV+j0r&pI0<Z#*F@NewL_t(oh3%EG5yCJGMHP+$c3=m38U|qkCSn2xNs~T1umkBr
z$K{M{{{NOQO@5c06+KH|irJ=>)hR*aYo610=Tj$riw^RV*FaDKrQ|Bajyc>yFaUCU
zMR2)T0JIg&08p546S5GYW2it#%R>bT1&D%JeGj-5cs$?Vn}6MJNB2yW7k(<ROzu5L
zYxNdD0A3Z;->(FagJ=SfGo7c1Do`G1(F)px-jodeWJ5ne@hNbYzNY7w>j6q`X0}(8
zl;l+-=dEJ@qMTncHe{e0kbhGJJ6M50Mw%WW1ccco@(iaSOwvtDeE_o7XovftFTMZ(
O002ovPDHLkU;%<^p>XN|

delta 284
zcmV+%0ptF#0>lE4F@OF^L_t(oh3%ES5dt9)g%>03;d;2-#6qmVimbpwOw6x`>p?S&
za8{1}Wz`w=&0Hc2@8hiiz+WF$vQC)hoVoFFNTxN_#gefXL@crzTS3^tUULluIS^$o
zL9ALo9#7X$b52bF0D#N+#!eiEl<+4RQHd@l*1O;C)(c~+34b@2OrQuSQ7<sfIhRj@
zqX0#K8iHC3gIM$g!2S8GH=GMVtH>kj0*KUa0l1Fgt0i7UScm=QQ6Kd@yA#kJOX;dM
z0o3Vm3v1tqW`Xn?;#Ty^)q=?9n%s%jq?JaQt4WG2h}fwF!L}f>*OXKS-XywP;03WH
i=ZcsDc}L5>PZf9e7ka+3O7I>40000<MNUMnLSTZ9<b~`2

diff --git a/core/assets-raw/sprites/items/liquid-nitrogen.png b/core/assets-raw/sprites/items/liquid-nitrogen.png
index 7f0d913212d39febe4ccde41db951113c1cd832c..6d44c42a83e8d57006af404b7a99ac3ec47f6621 100644
GIT binary patch
delta 244
zcmV<Q01N-L0-XYoF@M)dL_t(oh3!_`5yBu41e=JhXd7B)XhT|&D)7e-z<cb0i8F@%
z%go;GX1ODAZsO?h8X@PLs{-%InwE#uhz6vFWmAo(nK<=`TX_=K9Oo$7Bt8<@Qk(*L
z1k=E=4aAV(V*iGPuNpv2ScJts<-=orRx5b9EwF*FT*a*c%58|$486WfKtmWqaxtVK
zagGCT!S#L~66dh{8n$LD1JYY=1vmk2K&?=}hI^-AngK2a^iqP?P)ecqC``X(nh8#T
u64AaF;t}-BgKwbnk)~zrzgX3Y|HccconN?~f)bhl0000<MNUMnLSTYQ@^j<>

delta 268
zcmV+n0rUQy0<;2<F@Nq!L_t(oh3%Eg5yCJGL}i+QR-g@1CbR*qKo#PYj8XKrfEi$q
ziR^t|B^JP6A6APlKtxnGY%R2>yVx?$f|x~7<0y#wa@5=dA-<?Gw;(p$!^`PbYOaX|
z006k2@9M%vWEn|`t`^eM?~mJ+anwXxD<&|jPl9fMoh&#B(0>G=5YlEnNJLKn+Q%2Y
z;ZguzRsNzWfJ*%qK<YPqwakmC*J0W%^;P3Joq&7Z8&`D*fTp94S?7#k3#@6_w_;SO
z7F3RF@g!aoE{%DuCn>d{;-nUY+JeenOL7@xlNfG679^5fI${py9WDDlJphS(d0<7<
SYD@qC002ovP6b4+LSTYsxpz1K

diff --git a/core/assets-raw/sprites/items/liquid-ozone.png b/core/assets-raw/sprites/items/liquid-ozone.png
index 34607d5802b7328d7913b4b973618ce8098e53dc..be544ed2b13280965a3d0a59b24ec644a68a6514 100644
GIT binary patch
delta 250
zcmV<W00sZT0;2+uF@N1jL_t(oh3%HH5yK!1MIq;gInsIy50>*_=@=nxHVNlcx$_|*
zBq5Z>zXj<(J{S|ir9UfbijL>&0FAa))r(z(nKqjWV7e0}#u^xMaMYXw(HyWc??K!w
zO(?Y%gaUl_x9RFBxg`(+o&o^)t-j>s!Q`8O7+^*U^)_@9D04XhkhrZ;d-c|0Z$Zfk
z7+XNF0hY%dm|0v_?uW2WjSYZZPOe*EAq;pJVDyVX3#oqrb{Nl+zLplMnMTqynv+LT
zm=0hGLN<`T3p7C8g4q!4$y|_W02~<0!+FU~U(bqK=Gx<&D*ylh07*qoM6N<$f`@8s
Af&c&j

delta 282
zcmV+#0p<Rq0>T22F@O9?L_t(oh3%C+5`r)gg+XaNhb>2-<6w>lqw@%~oWn*YR$=10
z|5<fLeKRy<llSE<Ax-nwht*mqq-jp<f@5!5Q(Y_>dqKn^tFaY?9jrCiK#&7b<`TpX
zdwDxAq2`=Wstm9nuJlB(BTZsh3QsTK?jZ!%PtOrWTTp7f9Dm3K(ln?1NN^NjCjn##
zm;_wR`_Vomz<qqyKb#9dtH>kj0*KUa0l1Fgt0n%3N_D5>Rv&deyAx2~_ha93wI%?V
z4tvcC##^1n2&!yFtz0dLyspWeXicy*@?1?)Y(d0MB?z_!k-es*GVmr*-2yL&B{_G*
g7|c6b_I<holM@JfQ^UOef&c&j07*qoM6N<$f^89e$p8QV


From 2b5ff5646004041bb7e4d46eb02257b9ce62c16d Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az493-487.qfcvxp31ax1ubi3tmrxi40i00f.phxx.internal.cloudapp.net>
Date: Sun, 7 May 2023 13:39:11 +0000
Subject: [PATCH 3/7] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 1 +
 core/assets/bundles/bundle_bg.properties    | 1 +
 core/assets/bundles/bundle_ca.properties    | 1 +
 core/assets/bundles/bundle_cs.properties    | 1 +
 core/assets/bundles/bundle_da.properties    | 1 +
 core/assets/bundles/bundle_de.properties    | 1 +
 core/assets/bundles/bundle_es.properties    | 1 +
 core/assets/bundles/bundle_et.properties    | 1 +
 core/assets/bundles/bundle_eu.properties    | 1 +
 core/assets/bundles/bundle_fi.properties    | 1 +
 core/assets/bundles/bundle_fil.properties   | 1 +
 core/assets/bundles/bundle_fr.properties    | 1 +
 core/assets/bundles/bundle_hu.properties    | 1 +
 core/assets/bundles/bundle_id_ID.properties | 1 +
 core/assets/bundles/bundle_it.properties    | 1 +
 core/assets/bundles/bundle_ja.properties    | 1 +
 core/assets/bundles/bundle_ko.properties    | 1 +
 core/assets/bundles/bundle_lt.properties    | 1 +
 core/assets/bundles/bundle_nl.properties    | 1 +
 core/assets/bundles/bundle_nl_BE.properties | 1 +
 core/assets/bundles/bundle_pl.properties    | 1 +
 core/assets/bundles/bundle_pt_BR.properties | 1 +
 core/assets/bundles/bundle_pt_PT.properties | 1 +
 core/assets/bundles/bundle_ro.properties    | 1 +
 core/assets/bundles/bundle_ru.properties    | 1 +
 core/assets/bundles/bundle_sr.properties    | 1 +
 core/assets/bundles/bundle_sv.properties    | 1 +
 core/assets/bundles/bundle_th.properties    | 1 +
 core/assets/bundles/bundle_tk.properties    | 1 +
 core/assets/bundles/bundle_tr.properties    | 1 +
 core/assets/bundles/bundle_uk_UA.properties | 1 +
 core/assets/bundles/bundle_vi.properties    | 1 +
 core/assets/bundles/bundle_zh_CN.properties | 1 +
 core/assets/bundles/bundle_zh_TW.properties | 1 +
 34 files changed, 34 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index be1d49230f..344cc84b60 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1212,6 +1212,7 @@ rules.buildcostmultiplier = Множнік выдаткаў на будаўні
 rules.buildspeedmultiplier = Множнік хуткасці будаўніцтва
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Хвалі чакаюць ворагаў
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Радыус зоны высадкі ворагаў: [lightgray] (блокаў)
 rules.unitammo = Адзінкі Патрабуюць Боезапас
 rules.enemyteam = Варожая Каманда
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 75fef2da30..74f242d72e 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -1223,6 +1223,7 @@ rules.buildcostmultiplier = Множител на Необходимите Ре
 rules.buildspeedmultiplier = Множител на Скоростта за Строене
 rules.deconstructrefundmultiplier = Множител на Възстановени Ресурси при Деконструкция
 rules.waitForWaveToEnd = Вълните Изчакват за Врагове
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Радиус на Начална Точка на Враговете:[lightgray] (полета)
 rules.unitammo = Единиците се Нуждаят от Боеприпаси
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 9b1124097f..aa8f6c80db 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -1227,6 +1227,7 @@ rules.buildcostmultiplier = Multiplicador del cost de construcció
 rules.buildspeedmultiplier = Multiplicador de la velocitat de construcció
 rules.deconstructrefundmultiplier = Multiplicador dels elements recuperats per desmuntatge
 rules.waitForWaveToEnd = Les onades esperen fins veure enemics
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Radi de la zona d’aterratge:[lightgray] (caselles)
 rules.unitammo = Les unitats necessiten munició
 rules.enemyteam = Equip enemic
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 8efbc1271a..1f466d7906 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -1225,6 +1225,7 @@ rules.buildcostmultiplier = Násobek ceny stavění
 rules.buildspeedmultiplier = Násobek rychlosti stavění
 rules.deconstructrefundmultiplier = Násobek vratky při rozebrání
 rules.waitForWaveToEnd = Vlny čekají na nepřátele
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Poloměr oblasti pro vylíhnutí: [lightgray](dlaždic)[]
 rules.unitammo = Jednotky vyžadují munici
 rules.enemyteam = Nepřátelský Tým
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 4160a1b5e3..c8fd5d1af9 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1213,6 +1213,7 @@ rules.buildcostmultiplier = Byggepris-forstærker
 rules.buildspeedmultiplier = Byggehastigheds-forstærker
 rules.deconstructrefundmultiplier = Dekonstruerings-tilbagebetalings-forstærker
 rules.waitForWaveToEnd = Bølge-ventetid for fjender
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop-zone-radius:[lightgray] (felter)
 rules.unitammo = Enheder kræver ammunition
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 9b1ecaa963..72ae4e2a7c 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -1236,6 +1236,7 @@ rules.buildcostmultiplier = Bau-Kosten Multiplikator
 rules.buildspeedmultiplier = Bau-Schnelligkeit Multiplikator
 rules.deconstructrefundmultiplier = Abbau Ressourcen-Rückerstattung
 rules.waitForWaveToEnd = Warten bis Welle endet
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop-Zonen-Radius:[lightgray] (Kacheln)
 rules.unitammo = Einheiten benötigen Munition [red](wird vielleicht entfernt)
 rules.enemyteam = Gegnerteam
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index abf144ef11..2de2aeb941 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -1233,6 +1233,7 @@ rules.buildcostmultiplier = Multiplicador de coste de construcción
 rules.buildspeedmultiplier = Multiplicador de velocidad de construcción
 rules.deconstructrefundmultiplier = Multiplicador de devolución de desconstrucción
 rules.waitForWaveToEnd = Las oleadas esperan a los enemigos
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Radio de zona de aterrizaje:[lightgray] (bloques)
 rules.unitammo = Las unidades necesitan munición
 rules.enemyteam = Equipo enemigo
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index e7f861bab7..e3db9a8acc 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -1213,6 +1213,7 @@ rules.buildcostmultiplier = Ehitamise maksumuse kordaja
 rules.buildspeedmultiplier = Ehitamise kiiruse kordaja
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Järgmine laine ootab eelmise laine lõpuni
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Maandumisala raadius:[lightgray] (ühik)
 rules.unitammo = Units Require Ammo
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 8cbdbff722..74ec27b3c9 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -1215,6 +1215,7 @@ rules.buildcostmultiplier = Eraikitze kostu-biderkatzailea
 rules.buildspeedmultiplier = Eraikitze abiadura-biderkatzailea
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Atzeratu bolada etsairik geratzen bada
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Erruntze puntuaren erradioa:[lightgray] (lauzak)
 rules.unitammo = Units Require Ammo
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index a4c5dbacb6..7a55a6e548 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1212,6 +1212,7 @@ rules.buildcostmultiplier = Rakentamisen hintakerroin
 rules.buildspeedmultiplier = Rakentamisen nopeuskerroin
 rules.deconstructrefundmultiplier = Purkamisen palautuskerroin
 rules.waitForWaveToEnd = Tasot odottavat edellisen tason loppumista
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Syntypisteen säde:[lightgray] (laattoina)
 rules.unitammo = Yksiköt tarvitsevat ammuksia
 rules.enemyteam = Vihollisjoukkue
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 7ea3990b58..690a9cf7a5 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1212,6 +1212,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves Wait for Enemies
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index beaf92b21e..10672736c2 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1237,6 +1237,7 @@ rules.buildcostmultiplier = Multiplicateur du prix de construction
 rules.buildspeedmultiplier = Multiplicateur du temps de construction
 rules.deconstructrefundmultiplier = Multiplicateur du remboursement lors de la déconstruction
 rules.waitForWaveToEnd = Les Vagues attendent la mort des ennemis
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Rayon d'Apparition des ennemis :[lightgray] (tuiles)
 rules.unitammo = Les Unités nécessitent des munitions
 rules.enemyteam = Équipe ennemie
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index b815281973..ced7a37130 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1222,6 +1222,7 @@ rules.buildcostmultiplier = Építési költség szorzó
 rules.buildspeedmultiplier = Építési sebesség szorzó
 rules.deconstructrefundmultiplier = Bontási visszatérítés szorzó
 rules.waitForWaveToEnd = Waves Wait for Enemies
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Ledobási zóna sugara:[lightgray] (mező)
 rules.unitammo = Egységeknek kell lövedék
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 21fe0652f6..948310f2fa 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -1233,6 +1233,7 @@ rules.buildcostmultiplier = Penggandaan Harga Bangunan
 rules.buildspeedmultiplier = Penggandaan Waktu Pembuatan Bangunan
 rules.deconstructrefundmultiplier = Penggandaan Kembalinya Bahan Bangunan yang Dihancurkan
 rules.waitForWaveToEnd = Gelombang Menunggu Musuh
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Radius Titik Muncul:[lightgray] (ubin)
 rules.unitammo = Unit Membutuhkan Amunisi
 rules.enemyteam = Tim Musuh
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 57bca49b9e..4954075e6c 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -1219,6 +1219,7 @@ rules.buildcostmultiplier = Moltiplicatore Costo Costruzione
 rules.buildspeedmultiplier = Moltiplicatore Velocità Costruzione
 rules.deconstructrefundmultiplier = Moltiplicatore Rimborso di Smantellamento
 rules.waitForWaveToEnd = Le ondate aspettano fino a quando l'ondata precedente finisce
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Raggio di Generazione:[lightgray] (blocchi)
 rules.unitammo = Unità Richiedono Munizioni
 rules.enemyteam = Squadra avversaria
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index eaa2976db3..38af6215f0 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1225,6 +1225,7 @@ rules.buildcostmultiplier = 建設コストの倍率
 rules.buildspeedmultiplier = 建設速度の倍率
 rules.deconstructrefundmultiplier = ブロック破壊時の還元倍率
 rules.waitForWaveToEnd = 敵が倒されるまでウェーブの進行を中断
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = 出現範囲の半径:[lightgray] (タイル)
 rules.unitammo = ユニットは弾丸が必要
 rules.enemyteam = 敵チーム
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index d5dde6c445..f9ffc80ba8 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -1225,6 +1225,7 @@ rules.buildcostmultiplier = 건설 비용 배수
 rules.buildspeedmultiplier = 건설 속도 배수
 rules.deconstructrefundmultiplier = 철거 환불 배수
 rules.waitForWaveToEnd = 한 단계가 끝날때까지 대기
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = 스폰 구역 범위: [lightgray] (타일)
 rules.unitammo = 기체 탄약 필요
 rules.enemyteam = 적 팀
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 905909ac77..4454117573 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -1213,6 +1213,7 @@ rules.buildcostmultiplier = Statymo Kainų Daugiklis
 rules.buildspeedmultiplier = Statymo Greičio Daugiklis
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Laukti, kol pasibaigs banga
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Išmetimo Zonos Spindulys:[lightgray] (blokais)
 rules.unitammo = Units Require Ammo
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 4249f4afa7..edd6fb019b 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -1225,6 +1225,7 @@ rules.buildcostmultiplier = Bouwkosten Vermenigvuldiger
 rules.buildspeedmultiplier = Bouwsnelheid Vermenigvuldiger
 rules.deconstructrefundmultiplier = Deconstructie Terugbetalings Vermenigvuldiger
 rules.waitForWaveToEnd = Golven wachten tot alle vijanden zijn verslagen
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Vijandelijke Spawn Diameter:[lightgray] (tegels)
 rules.unitammo = Eenheden Gebruiken Ammunitie
 rules.enemyteam = Vijandelijk Team
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 0ee9702da3..e09a1f6df9 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -1213,6 +1213,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves wait for enemies
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 7b57e1abe6..a7436fdb24 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -1223,6 +1223,7 @@ rules.buildcostmultiplier = Mnożnik Kosztów Budowania
 rules.buildspeedmultiplier = Mnożnik Prędkości Budowania
 rules.deconstructrefundmultiplier = Mnożnik Zwrotu Dekonstrukcji
 rules.waitForWaveToEnd = Fale Czekają Na Przeciwników
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Zasięg Strefy Zrzutu:[lightgray] (kratki)
 rules.unitammo = Jednostki Potrzebują Amunicji
 rules.enemyteam = Drużyna Wroga
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 0790d7ce77..409eae94a7 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1234,6 +1234,7 @@ rules.buildcostmultiplier = Multiplicador de custo de construção
 rules.buildspeedmultiplier = Multiplicador de velocidade de construção
 rules.deconstructrefundmultiplier = Multiplicador de reembolso de desconstrução 
 rules.waitForWaveToEnd = Hordas esperam inimigos
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Raio da zona de spawn:[lightgray] (blocos)
 rules.unitammo = Unidades requerem munição
 rules.enemyteam = Time Inimigo
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index d2748fb0f1..b497ffc8cd 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1213,6 +1213,7 @@ rules.buildcostmultiplier = Multiplicador de custo de construção
 rules.buildspeedmultiplier = Multiplicador de velocidade de construção
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = hordas esperam inimigos
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Raio da zona de spawn:[lightgray] (blocos)
 rules.unitammo = Units Require Ammo
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 9b43dc2570..d83cc754a6 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -1225,6 +1225,7 @@ rules.buildcostmultiplier = Multiplicatorul Costului Construcției
 rules.buildspeedmultiplier = Multiplicatorul Vitezei de Construcție
 rules.deconstructrefundmultiplier = Multiplicatorul Recompensei la Deconstrucție
 rules.waitForWaveToEnd = Valurile Așteaptă Inamicii
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Raza Zonei de Lansare:[lightgray] (pătrate)
 rules.unitammo = Unitățile Necesită Muniție
 rules.enemyteam = Echipa Inamică
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 938d4e97fe..a3f905eea5 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1226,6 +1226,7 @@ rules.buildcostmultiplier = Множитель затрат на строите
 rules.buildspeedmultiplier = Множитель скорости строительства
 rules.deconstructrefundmultiplier = Множитель возврата ресурсов при разборке
 rules.waitForWaveToEnd = Волны ожидают врагов
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Радиус зоны высадки врагов:[lightgray] (блоков)
 rules.unitammo = Боев. ед. требуют боеприпасы
 rules.enemyteam = Команда Врагов
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 19c8975a55..386a7a57f6 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -1227,6 +1227,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Talasi Čekaju Za Neprijatelje
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Radijus Zone Prijema:[lightgray] (polja)
 rules.unitammo = Jedinice Zahtevaju Municiju [red](može biti uklonjena)
 rules.enemyteam = Neprilateljski Tim
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 8725b706c2..732d87cdfc 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1213,6 +1213,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves wait for enemies
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 824be27ce5..abb7516a18 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -1227,6 +1227,7 @@ rules.buildcostmultiplier = พหุคูณราคาทรัพยาก
 rules.buildspeedmultiplier = พหุคูณความเร็วการสร้าง
 rules.deconstructrefundmultiplier = พหุคูณการคืนทรัพยากรเมื่อทำลาย
 rules.waitForWaveToEnd = คลื่นจะรอศัตรู
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = รัศมีจุดเกิดของศัตรู:[lightgray] (ช่อง)
 rules.unitammo = ยูนิตต้องใช้กระสุน
 rules.enemyteam = ทีมศัตรู
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 6742bc0239..29f41e8657 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -1213,6 +1213,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves wait for enemies
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo
 rules.enemyteam = Enemy Team
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 6e6864cebe..1b88b54f42 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -1224,6 +1224,7 @@ rules.buildcostmultiplier = İnşa Ücreti Çarpanı
 rules.buildspeedmultiplier = İnşa Hızı Çarpanı
 rules.deconstructrefundmultiplier = Yıkım İade Çarpanı
 rules.waitForWaveToEnd = Dalgalar Düşmanı Bekler
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = İniş Noktası Yarıçapı: [lightgray](kare)
 rules.unitammo = Birlikler Mermi Gerektirir
 rules.enemyteam = Düşman Takım
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 5cca637bf9..812e34cc0a 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -1235,6 +1235,7 @@ rules.buildcostmultiplier = Множник затрат на будування
 rules.buildspeedmultiplier = Множник швидкості будування
 rules.deconstructrefundmultiplier = Множник відшкодування в разі демонтажу
 rules.waitForWaveToEnd = Хвилі чекають на завершення попередньої
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Радіус зони висадки:[lightgray] (плитки)
 rules.unitammo = Бойові одиниці потребують боєприпасів
 rules.enemyteam = Ворожа команда
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 6aeb178ce3..515f53b326 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1228,6 +1228,7 @@ rules.buildcostmultiplier = Hệ số chi phí xây dựng
 rules.buildspeedmultiplier = Hệ số tốc độ xây dựng
 rules.deconstructrefundmultiplier = Hệ số số vật phẩm hoàn lại khi phá công trình
 rules.waitForWaveToEnd = Đợt chờ hết kẻ địch
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Bán kính vùng thả:[lightgray] (ô)
 rules.unitammo = Quân lính cần đạn
 rules.enemyteam = Đội quân địch
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index a84a1594c5..b23c52d0bb 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1236,6 +1236,7 @@ rules.buildcostmultiplier = 建造花费倍率
 rules.buildspeedmultiplier = 建造速度倍率
 rules.deconstructrefundmultiplier = 拆除返还倍率
 rules.waitForWaveToEnd = 等待波次结束
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = 敌人出生点禁区大小：[lightgray]（格）
 rules.unitammo = 单位有弹药限制
 rules.enemyteam = 敌方队伍
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index d70684c07c..44690eeeec 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -1232,6 +1232,7 @@ rules.buildcostmultiplier = 建設成本倍數
 rules.buildspeedmultiplier = 建設速度倍數
 rules.deconstructrefundmultiplier = 拆除資源返還比例
 rules.waitForWaveToEnd = 等待所有敵人毀滅才開始下一波次
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = 空降區半徑：[lightgray]（格）
 rules.unitammo = 單位需要彈藥
 rules.enemyteam = 敵方隊伍

From 23f1d24c45d4311c44197b1c87387891d0653a44 Mon Sep 17 00:00:00 2001
From: JniTrRny <85090668+JniTrRny@users.noreply.github.com>
Date: Sun, 7 May 2023 21:42:45 +0700
Subject: [PATCH 4/7] Search bar for wave UI (#8501)

* wave search + other editor things

* everything but wave search
---
 core/assets/bundles/bundle.properties         |   2 +
 .../src/mindustry/editor/MapEditorDialog.java |   6 +-
 core/src/mindustry/editor/MapLoadDialog.java  |  13 +-
 core/src/mindustry/editor/WaveInfoDialog.java | 188 +++++++++++-------
 core/src/mindustry/game/SpawnGroup.java       |   8 +-
 .../mindustry/maps/filters/FilterOption.java  |   3 +-
 .../mindustry/world/blocks/ItemSelection.java |  10 +-
 7 files changed, 138 insertions(+), 92 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index e4111913e4..8b0088943c 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -462,6 +462,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java
index d727c950d7..1d30d18d82 100644
--- a/core/src/mindustry/editor/MapEditorDialog.java
+++ b/core/src/mindustry/editor/MapEditorDialog.java
@@ -752,9 +752,9 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
         cont.table(search -> {
             search.image(Icon.zoom).padRight(8);
-            search.field("", this::rebuildBlockSelection)
+            search.field("", this::rebuildBlockSelection).growX()
             .name("editor/search").maxTextLength(maxNameLength).get().setMessageText("@players.search");
-        }).pad(-2);
+        }).growX().pad(-2).padLeft(6f);
         cont.row();
         cont.table(Tex.underline, extra -> extra.labelWrap(() -> editor.drawBlock.localizedName).width(200f).center()).growX();
         cont.row();
@@ -803,7 +803,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
         }
 
         if(i == 0){
-            blockSelection.add("@none").color(Color.lightGray).padLeft(80f).padTop(10f);
+            blockSelection.add("@none.found").color(Color.lightGray).padLeft(54f).padTop(10f);
         }
     }
 }
diff --git a/core/src/mindustry/editor/MapLoadDialog.java b/core/src/mindustry/editor/MapLoadDialog.java
index 4ed63a1a7f..1217c87020 100644
--- a/core/src/mindustry/editor/MapLoadDialog.java
+++ b/core/src/mindustry/editor/MapLoadDialog.java
@@ -30,6 +30,7 @@ public class MapLoadDialog extends BaseDialog{
         buttons.defaults().size(200f, 50f);
         buttons.button("@cancel", this::hide);
         buttons.add(button);
+        addCloseListener();
     }
 
     public void rebuild(){
@@ -48,13 +49,13 @@ public class MapLoadDialog extends BaseDialog{
         table.defaults().size(200f, 90f).pad(4f);
         table.margin(10f);
 
-        ScrollPane pane = new ScrollPane(table, Styles.horizontalPane);
+        ScrollPane pane = new ScrollPane(table);
         pane.setFadeScrollBars(false);
 
         for(Map map : maps.all()){
 
-            TextButton button = new TextButton(map.name(), Styles.togglet);
-            button.add(new BorderImage(map.safeTexture(), 2f).setScaling(Scaling.fit)).size(16 * 4f);
+            TextButton button = new TextButton(map.name(), Styles.flatTogglet);
+            button.add(new BorderImage(map.safeTexture(), 2f).setScaling(Scaling.fit)).padLeft(5f).size(16 * 4f);
             button.getCells().reverse();
             button.clicked(() -> selected = map);
             button.getLabelCell().grow().left().padLeft(5f);
@@ -63,14 +64,12 @@ public class MapLoadDialog extends BaseDialog{
             if(++i % maxcol == 0) table.row();
         }
 
-        if(maps.all().size == 0){
+        if(maps.all().isEmpty()){
             table.add("@maps.none").center();
-        }else{
-            cont.add("@editor.loadmap");
         }
 
         cont.row();
-        cont.add(pane);
+        cont.add(pane).growX();
     }
 
 }
diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java
index cfbdb59f3c..66a29cd487 100644
--- a/core/src/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/mindustry/editor/WaveInfoDialog.java
@@ -1,7 +1,9 @@
 package mindustry.editor;
 
 import arc.*;
+import arc.func.*;
 import arc.graphics.*;
+import arc.input.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.event.*;
@@ -21,19 +23,18 @@ import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 
-import java.util.*;
-
 import static mindustry.Vars.*;
 import static mindustry.game.SpawnGroup.*;
 
 public class WaveInfoDialog extends BaseDialog{
-    private int displayed = 20;
+    private int start = 0, displayed = 20;
     Seq<SpawnGroup> groups = new Seq<>();
-    private SpawnGroup expandedGroup;
+    private @Nullable SpawnGroup expandedGroup;
 
     private Table table;
-    private int start = 0;
+    private int search = -1;
     private UnitType lastType = UnitTypes.dagger;
+    private @Nullable UnitType filterType;
     private Sort sort = Sort.begin;
     private boolean reverseSort = false;
     private float updateTimer, updatePeriod = 1f;
@@ -49,45 +50,22 @@ public class WaveInfoDialog extends BaseDialog{
         });
         hidden(() -> state.rules.spawns = groups);
 
-        addCloseListener();
-
         onResize(this::setup);
-        buttons.button(Icon.filter, () -> {
-            BaseDialog dialog = new BaseDialog("@waves.sort");
-            dialog.setFillParent(false);
-            dialog.cont.table(Tex.button, t -> {
-                for(Sort s : Sort.all){
-                    t.button("@waves.sort." + s, Styles.flatTogglet, () -> {
-                        sort = s;
-                        dialog.hide();
-                        buildGroups();
-                    }).size(150f, 60f).checked(s == sort);
-                }
-            }).row();
-            dialog.cont.check("@waves.sort.reverse", b -> {
-                reverseSort = b;
-                buildGroups();
-            }).padTop(4).checked(reverseSort).padBottom(8f);
-            dialog.addCloseButton();
-            dialog.show();
-            buildGroups();
-        }).size(60f, 64f);
-
         addCloseButton();
 
-        buttons.button("@waves.edit", Icon.pencil, () -> {
+        buttons.button("@waves.edit", Icon.edit, () -> {
             BaseDialog dialog = new BaseDialog("@waves.edit");
             dialog.addCloseButton();
             dialog.setFillParent(false);
             dialog.cont.table(Tex.button, t -> {
-                var style = Styles.flatt;
-                t.defaults().size(210f, 58f);
+                var style = Styles.cleart;
+                t.defaults().size(280f, 64f).pad(2f);
 
                 t.button("@waves.copy", Icon.copy, style, () -> {
                     ui.showInfoFade("@waves.copied");
                     Core.app.setClipboardText(maps.writeWaves(groups));
                     dialog.hide();
-                }).disabled(b -> groups == null).marginLeft(12f).row();
+                }).disabled(b -> groups == null || groups.isEmpty()).marginLeft(12f).row();
 
                 t.button("@waves.load", Icon.download, style, () -> {
                     try{
@@ -98,16 +76,16 @@ public class WaveInfoDialog extends BaseDialog{
                         ui.showErrorMessage("@waves.invalid");
                     }
                     dialog.hide();
-                }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null || Core.app.getClipboardText().isEmpty()).row();
+                }).disabled(Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith("[")).marginLeft(12f).row();
 
-                t.button("@settings.reset", Icon.upload, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
-                    groups = JsonIO.copy(waves.get());
+                t.button("@clear", Icon.none, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
+                    groups.clear();
                     buildGroups();
                     dialog.hide();
                 })).marginLeft(12f).row();
 
-                t.button("@clear", Icon.cancel, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
-                    groups.clear();
+                t.button("@settings.reset", Icon.refresh, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
+                    groups = JsonIO.copy(waves.get());
                     buildGroups();
                     dialog.hide();
                 })).marginLeft(12f);
@@ -144,7 +122,7 @@ public class WaveInfoDialog extends BaseDialog{
             buttons.button(Core.bundle.get("waves.random"), Icon.refresh, () -> {
                 groups.clear();
                 groups = Waves.generate(1f / 10f);
-                updateWaves();
+                buildGroups();
             }).width(200f);
         }
     }
@@ -171,19 +149,53 @@ public class WaveInfoDialog extends BaseDialog{
 
     void setup(){
         groups = JsonIO.copy(state.rules.spawns.isEmpty() ? waves.get() : state.rules.spawns);
+        if(groups == null) groups = new Seq<>();
 
         cont.clear();
         cont.stack(new Table(Tex.clear, main -> {
-            main.pane(t -> table = t).growX().growY().padRight(8f).scrollX(false);
-            main.row();
-            main.button("@add", () -> {
-                if(groups == null) groups = new Seq<>();
-                SpawnGroup newGroup = new SpawnGroup(lastType);
-                groups.add(newGroup);
-                expandedGroup = newGroup;
-                showUpdate(newGroup);
-                buildGroups();
-            }).growX().height(70f);
+            main.table(s -> {
+                s.image(Icon.zoom).padRight(8);
+                s.field(search < 0 ? "" : (search + 1) + "", TextFieldFilter.digitsOnly, text -> {
+                    search = groups.any() ? Strings.parseInt(text, 0) - 1 : -1;
+                    start = Math.max(search - (displayed / 2) - (displayed % 2), 0);
+                    buildGroups();
+                }).growX().maxTextLength(8).get().setMessageText("@waves.search");
+                s.button(Icon.units, Styles.emptyi, () -> showUnits(type -> filterType = type, true)).size(46f).tooltip("@waves.filter.unit")
+                .update(b -> b.getStyle().imageUp = filterType != null ? new TextureRegionDrawable(filterType.uiIcon) : Icon.filter);
+            }).growX().pad(6f).row();
+
+            main.pane(t -> table = t).grow().padRight(8f).scrollX(false).row();
+
+            main.table(t -> {
+                t.button("@add", () -> {
+                    SpawnGroup newGroup = new SpawnGroup(lastType);
+                    groups.add(newGroup);
+                    expandedGroup = newGroup;
+                    showUnits(type -> newGroup.type = lastType = type, false);
+                    buildGroups();
+                }).growX().height(70f);
+
+                t.button(Icon.filter, () -> {
+                    BaseDialog dialog = new BaseDialog("@waves.sort");
+                    dialog.setFillParent(false);
+                    dialog.cont.table(Tex.button, f -> {
+                        for(Sort s : Sort.all){
+                            f.button("@waves.sort." + s, Styles.flatTogglet, () -> {
+                                sort = s;
+                                dialog.hide();
+                                buildGroups();
+                            }).size(150f, 60f).checked(s == sort);
+                        }
+                    }).row();
+                    dialog.cont.check("@waves.sort.reverse", b -> {
+                        reverseSort = b;
+                        buildGroups();
+                    }).padTop(4).checked(reverseSort).padBottom(8f);
+                    dialog.addCloseButton();
+                    dialog.show();
+                }).size(64f, 70f).padLeft(6f);
+            }).growX();
+
         }), new Label("@waves.none"){{
             visible(() -> groups.isEmpty());
             this.touchable = Touchable.disabled;
@@ -202,10 +214,13 @@ public class WaveInfoDialog extends BaseDialog{
         table.margin(10f);
 
         if(groups != null){
-            groups.sort(sort.sort);
+            groups.sort(Structs.comps(Structs.comparingFloat(sort.sort), Structs.comparingFloat(sort.secondary)));
             if(reverseSort) groups.reverse();
 
             for(SpawnGroup group : groups){
+                if(group.effect == StatusEffects.none) group.effect = null;
+                if((search >= 0 && group.getSpawned(search) <= 0) || (filterType != null && group.type != filterType)) continue;
+
                 table.table(Tex.button, t -> {
                     t.margin(0).defaults().pad(3).padLeft(5f).growX().left();
                     t.button(b -> {
@@ -218,24 +233,31 @@ public class WaveInfoDialog extends BaseDialog{
                         b.label(() -> (group.begin + 1) + "").color(Color.lightGray).minWidth(45f).labelAlign(Align.left).left();
 
                         b.button(Icon.copySmall, Styles.emptyi, () -> {
-                            SpawnGroup newGroup = group.copy();
-                            expandedGroup = newGroup;
-                            groups.add(newGroup);
+                            SpawnGroup copy = group.copy();
+                            expandedGroup = copy;
+                            groups.insert(groups.indexOf(group) + 1, copy);
                             buildGroups();
-                        }).pad(-6).size(46f);
+                        }).pad(-6).size(46f).tooltip("@editor.copy");
 
-                        b.button(group.effect != null && group.effect != StatusEffects.none ?
+                        b.button(group.effect != null ?
                             new TextureRegionDrawable(group.effect.uiIcon) :
                             Icon.logicSmall,
-                        Styles.emptyi, () -> showEffect(group)).pad(-6).size(46f);
+                        Styles.emptyi, () -> showEffects(group)).pad(-6).size(46f).scaling(Scaling.fit).tooltip(group.effect != null ? group.effect.localizedName : "@none");
 
-                        b.button(Icon.unitsSmall, Styles.emptyi, () -> showUpdate(group)).pad(-6).size(46f);
+                        b.button(Icon.unitsSmall, Styles.emptyi, () -> showUnits(type -> group.type = lastType = type, false)).pad(-6).size(46f).tooltip("@stat.unittype");
                         b.button(Icon.cancel, Styles.emptyi, () -> {
                             groups.remove(group);
+                            if(expandedGroup == group) expandedGroup = null;
                             table.getCell(t).pad(0f);
                             t.remove();
                             buildGroups();
-                        }).pad(-6).size(46f).padRight(-12f);
+                        }).pad(-6).size(46f).padRight(-12f).tooltip("@waves.remove");
+                        b.clicked(KeyCode.mouseMiddle, () -> {
+                            SpawnGroup copy = group.copy();
+                            groups.insert(groups.indexOf(group) + 1, copy);
+                            expandedGroup = copy;
+                            buildGroups();
+                        });
                     }, () -> {
                         expandedGroup = expandedGroup == group ? null : group;
                         buildGroups();
@@ -369,7 +391,7 @@ public class WaveInfoDialog extends BaseDialog{
                                             dialog.hide();
                                         }).size(110f, 45f).checked(-1 == group.spawn);
                                     }
-                                });
+                                }).grow();
                                 dialog.setFillParent(false);
                                 dialog.addCloseButton();
                                 dialog.show();
@@ -381,6 +403,10 @@ public class WaveInfoDialog extends BaseDialog{
 
                 table.row();
             }
+
+            if(table.getChildren().isEmpty() && groups.any()){
+                table.add("@none.found");
+            }
         }else{
             table.add("@editor.default");
         }
@@ -388,11 +414,23 @@ public class WaveInfoDialog extends BaseDialog{
         updateWaves();
     }
 
-    void showUpdate(SpawnGroup group){
+    void showUnits(Cons<UnitType> cons, boolean reset){
         BaseDialog dialog = new BaseDialog("");
         dialog.setFillParent(true);
         dialog.cont.pane(p -> {
-            int i = 0;
+            p.defaults().pad(2).fillX();
+            if(reset){
+                p.button(t -> {
+                    t.left();
+                    t.image(Icon.none).size(8 * 4).scaling(Scaling.fit).padRight(2f);
+                    t.add("@settings.resetKey");
+                }, () -> {
+                    cons.get(null);
+                    dialog.hide();
+                    buildGroups();
+                }).margin(12f);
+            }
+            int i = reset ? 1 : 0;
             for(UnitType type : content.units()){
                 if(type.isHidden()) continue;
                 p.button(t -> {
@@ -400,19 +438,18 @@ public class WaveInfoDialog extends BaseDialog{
                     t.image(type.uiIcon).size(8 * 4).scaling(Scaling.fit).padRight(2f);
                     t.add(type.localizedName);
                 }, () -> {
-                    lastType = type;
-                    group.type = type;
+                    cons.get(type);
                     dialog.hide();
                     buildGroups();
-                }).pad(2).margin(12f).fillX();
+                }).margin(12f);
                 if(++i % 3 == 0) p.row();
             }
-        });
+        }).growX().scrollX(false);
         dialog.addCloseButton();
         dialog.show();
     }
 
-    void showEffect(SpawnGroup group){
+    void showEffects(SpawnGroup group){
         BaseDialog dialog = new BaseDialog("");
         dialog.setFillParent(true);
         dialog.cont.pane(p -> {
@@ -434,28 +471,33 @@ public class WaveInfoDialog extends BaseDialog{
                         t.add("@settings.resetKey");
                     }
                 }, () -> {
-                    group.effect = effect;
+                    group.effect = effect != StatusEffects.none ? effect : null;
                     dialog.hide();
                     buildGroups();
                 }).pad(2).margin(12f).fillX();
                 if(++i % 3 == 0) p.row();
             }
-        });
+        }).growX().scrollX(false);
         dialog.addCloseButton();
         dialog.show();
     }
 
     enum Sort{
-        begin(Structs.comps(Structs.comparingFloat(g -> g.begin), Structs.comparingFloat(g -> g.type.id))),
-        health(Structs.comps(Structs.comparingFloat(g -> g.type.health), Structs.comparingFloat(g -> g.begin))),
-        type(Structs.comps(Structs.comparingFloat(g -> g.type.id), Structs.comparingFloat(g -> g.begin)));
+        begin(g -> g.begin, g -> g.type.id),
+        health(g -> g.type.health),
+        type(g -> g.type.id);
 
         static final Sort[] all = values();
 
-        final Comparator<SpawnGroup> sort;
+        final Floatf<SpawnGroup> sort, secondary;
 
-        Sort(Comparator<SpawnGroup> sort){
+        Sort(Floatf<SpawnGroup> sort){
+            this(sort, g -> g.begin);
+        }
+
+        Sort(Floatf<SpawnGroup> sort, Floatf<SpawnGroup> secondary){
             this.sort = sort;
+            this.secondary = secondary;
         }
     }
 
@@ -465,4 +507,4 @@ public class WaveInfoDialog extends BaseDialog{
         graph.to = start + displayed;
         graph.rebuild();
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java
index b4877e7917..d155c8bc60 100644
--- a/core/src/mindustry/game/SpawnGroup.java
+++ b/core/src/mindustry/game/SpawnGroup.java
@@ -118,7 +118,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
         if(unitAmount != 1) json.writeValue("amount", unitAmount);
         if(effect != null) json.writeValue("effect", effect.name);
         if(spawn != -1) json.writeValue("spawn", spawn);
-        if(payloads != null && payloads.size > 0) json.writeValue("payloads", payloads.map(u -> u.name).toArray(String.class));
+        if(payloads != null && payloads.any()) json.writeValue("payloads", payloads.map(u -> u.name).toArray(String.class));
         if(items != null && items.amount > 0) json.writeValue("items", items);
 
     }
@@ -127,7 +127,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
     public void read(Json json, JsonValue data){
         String tname = data.getString("type", "dagger");
 
-        type = content.getByName(ContentType.unit, LegacyIO.unitMap.get(tname, tname));
+        type = content.unit(LegacyIO.unitMap.get(tname, tname));
         if(type == null) type = UnitTypes.dagger;
         begin = data.getInt("begin", 0);
         end = data.getInt("end", never);
@@ -138,7 +138,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
         shieldScaling = data.getFloat("shieldScaling", 0);
         unitAmount = data.getInt("amount", 1);
         spawn = data.getInt("spawn", -1);
-        if(data.has("payloads")) payloads = Seq.with(json.readValue(String[].class, data.get("payloads"))).map(s -> content.getByName(ContentType.unit, s));
+        if(data.has("payloads")) payloads = Seq.with(json.readValue(String[].class, data.get("payloads"))).map(s -> content.unit(s));
         if(data.has("items")) items = json.readValue(ItemStack.class, data.get("items"));
 
 
@@ -146,7 +146,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
         if(data.has("effect") && data.get("effect").isNumber() && data.getInt("effect", -1) == 8){
             effect = StatusEffects.boss;
         }else{
-            effect = content.getByName(ContentType.status, data.has("effect") && data.get("effect").isString() ? data.getString("effect", "none") : "none");
+            effect = content.statusEffect(data.has("effect") && data.get("effect").isString() ? data.getString("effect", "none") : "none");
         }
     }
 
diff --git a/core/src/mindustry/maps/filters/FilterOption.java b/core/src/mindustry/maps/filters/FilterOption.java
index 3082145494..da8921a195 100644
--- a/core/src/mindustry/maps/filters/FilterOption.java
+++ b/core/src/mindustry/maps/filters/FilterOption.java
@@ -108,6 +108,7 @@ public abstract class FilterOption{
                 .setRegion(supplier.get() == Blocks.air ? Icon.none.getRegion() : supplier.get().uiIcon)).size(iconSmall), () -> {
                 BaseDialog dialog = new BaseDialog("@filter.option." + name);
                 dialog.cont.pane(t -> {
+                    t.margin(14f);
                     int i = 0;
                     for(Block block : Vars.content.blocks()){
                         if(!filter.get(block)) continue;
@@ -120,7 +121,7 @@ public abstract class FilterOption{
                         if(++i % 10 == 0) t.row();
                     }
                     dialog.setFillParent(i > 100);
-                }).padRight(8f).scrollX(false);
+                }).scrollX(false);
 
 
                 dialog.addCloseButton();
diff --git a/core/src/mindustry/world/blocks/ItemSelection.java b/core/src/mindustry/world/blocks/ItemSelection.java
index 1f833e6958..27172bc307 100644
--- a/core/src/mindustry/world/blocks/ItemSelection.java
+++ b/core/src/mindustry/world/blocks/ItemSelection.java
@@ -85,9 +85,11 @@ public class ItemSelection{
 
         Table main = new Table().background(Styles.black6);
         if(rowCount > rows * 1.5f){
-            search = main.field(null, text -> rebuild.run()).width(40 * columns).padBottom(4).left().growX().get();
-            search.setMessageText("@players.search");
-            main.row();
+            main.table(s -> {
+                s.image(Icon.zoom).padLeft(4f);
+                search = s.field(null, text -> rebuild.run()).width(40 * columns).padBottom(4).left().growX().get();
+                search.setMessageText("@players.search");
+            }).row();
         }
 
         ScrollPane pane = new ScrollPane(cont, Styles.smallPane);
@@ -101,7 +103,7 @@ public class ItemSelection{
         }
 
         pane.setOverscroll(false, false);
-        main.add(pane).maxHeight(40 * rows);
+        main.add(pane).growX().maxHeight(40 * rows);
         table.top().add(main);
     }
 }
\ No newline at end of file

From a36e31c4b40f67422ee1adb171643846011fb162 Mon Sep 17 00:00:00 2001
From: Mario A <10923513+Midblyte@users.noreply.github.com>
Date: Sun, 7 May 2023 16:32:10 +0000
Subject: [PATCH 5/7] Fix some Italian translations (#8564)

Co-authored-by: Midblyte <midblyte@anonaddy.me>
---
 core/assets/bundles/bundle_it.properties | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 4954075e6c..366a0cf808 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -49,7 +49,7 @@ mods.browser.noreleases = [scarlet]Nessuna versione trovata\n[accent]Cerca se la
 mods.browser.latest = <Ultima versione>
 mods.browser.releases = Versioni
 mods.github.open = Repo
-mods.github.open-release = Pagina delle versioni di mindustry
+mods.github.open-release = Pagina delle versioni di Mindustry
 mods.browser.sortdate = Ordinato per data
 mods.browser.sortstars = Ordinato per stelle
 
@@ -837,7 +837,7 @@ paused = [accent]< In Pausa >
 clear = Pulisci
 banned = [scarlet]Bandito
 unsupported.environment = [scarlet]Ambiente non supportato
-yes = Si
+yes = Sì
 no = No
 info.title = Info
 error.title = [scarlet]Si è verificato un errore
@@ -875,7 +875,7 @@ stat.poweruse = Consumo Energetico
 stat.powerdamage = Energia/Danno
 stat.itemcapacity = Capacità Oggetti
 stat.memorycapacity = Capacità di Memoria
-stat.basepowergeneration = Generazione Minina di Energia
+stat.basepowergeneration = Generazione Minima di Energia
 stat.productiontime = Tempo di Produzione
 stat.repairtime = Tempo di Riparazione Completa
 stat.repairspeed = Velocità di riparazione
@@ -892,7 +892,7 @@ stat.maxunits = Unità Attive Massime
 stat.health = Salute
 stat.armor = Armatura
 stat.buildtime = Tempo di Costruzione
-stat.maxconsecutive = Limite Consecutive
+stat.maxconsecutive = Limite Consecutivi
 stat.buildcost = Costo di Costruzione
 stat.inaccuracy = Inaccuratezza
 stat.shots = Colpi
@@ -985,9 +985,9 @@ bullet.knockback = [stat]{0}[lightgray] contraccolpo
 bullet.pierce = [stat]{0}[lightgray]x perforazione
 bullet.infinitepierce = [stat]perforazione
 bullet.healpercent = [stat]{0}[lightgray]% guarigione
-bullet.healamount = [stat]{0}[lightgray] qquantità di cura
+bullet.healamount = [stat]{0}[lightgray] quantità di cura
 bullet.multiplier = [stat]{0}[lightgray]x moltiplicatore munizioni
-bullet.reload = [stat]{0}[lightgray]x ricarica
+bullet.reload = [stat]{0}%[lightgray] ricarica
 bullet.range = [stat]{0}[lightgray] raggio in blocchi
 
 unit.blocks = blocchi
@@ -1026,7 +1026,7 @@ setting.shadows.name = Ombre
 setting.blockreplace.name = Suggerimento Blocchi Automatico
 setting.linear.name = Filtro Lineare
 setting.hints.name = Suggerimenti
-setting.logichints.name = Suggerimenti
+setting.logichints.name = Suggerimenti sulla logica
 setting.backgroundpause.name = Metti in pausa quando in background
 setting.buildautopause.name = Pausa Automatica nella Costruzione
 setting.doubletapmine.name = Doppio click per minare
@@ -1052,7 +1052,7 @@ setting.difficulty.hard = Difficile
 setting.difficulty.insane = Impossibile
 setting.difficulty.name = Difficoltà:
 setting.screenshake.name = Movimento dello Schermo
-setting.bloomintensity.name = Intensità d'illuminazione (bloom)
+setting.bloomintensity.name = Intensità d'illuminazione (Bloom Intensity)
 setting.bloomblur.name = Illuminazione sfocata (Bloom Blur)
 setting.effects.name = Visualizza Effetti
 setting.destroyedblocks.name = Visualizza Blocchi Distrutti
@@ -1072,7 +1072,7 @@ setting.smoothcamera.name = Visuale fluida
 setting.vsync.name = VSync
 setting.pixelate.name = Pixellato
 setting.minimap.name = Mostra Minimappa
-setting.coreitems.name = Mostra Oggetti Nucleo (WIP)
+setting.coreitems.name = Mostra Oggetti Nucleo
 setting.position.name = Mostra Posizione Giocatori
 setting.mouseposition.name = Mostra mouse
 setting.musicvol.name = Volume Musica
@@ -1162,9 +1162,9 @@ keybind.chat.name = Chat
 keybind.player_list.name = Lista dei Giocatori
 keybind.console.name = Console
 keybind.rotate.name = Ruota
-keybind.rotateplaced.name = Ruota Blocco Esistente (premuto)
+keybind.rotateplaced.name = Ruota Blocco Esistente (mantenere premuto)
 keybind.toggle_menus.name = Mostra/Nascondi Menu
-keybind.chat_history_prev.name = Scorri Chat vero l'alto 
+keybind.chat_history_prev.name = Scorri Chat verso l'alto 
 keybind.chat_history_next.name = Scorri Chat verso il basso
 keybind.chat_scroll.name = Scorri Chat
 keybind.chat_mode.name = Cambia modalità chat
@@ -1193,8 +1193,8 @@ rules.wavesending = Wave Sending
 rules.waves = Ondate
 rules.attack = Modalità Attacco
 rules.rtsai = RTS AI
-rules.rtsminsquadsize = Dimensione squadra minima
-rules.rtsmaxsquadsize = Dimensione squadra massima
+rules.rtsminsquadsize = Dimensione minima squadra
+rules.rtsmaxsquadsize = Dimensione massima squadra
 rules.rtsminattackweight = Min Attack Weight
 rules.cleanupdeadteams = Cancella costruzioni delle squadre sconfitte (PvP)
 rules.corecapture = Cattura nucleo alla distruzione
@@ -1417,7 +1417,7 @@ block.dirt.name = Terra
 block.dirt-wall.name = Muro di Terra
 block.mud.name = Fango
 block.white-tree-dead.name = Albero Bianco Morto
-block.white-tree.name = Albero Morto
+block.white-tree.name = Albero Bianco
 block.spore-cluster.name = Agglomerato di Spore
 block.metal-floor.name = Pavimento Metallico 1
 block.metal-floor-2.name = Pavimento Metallico 2
@@ -1551,7 +1551,7 @@ block.segment.name = Segmentatore
 block.ground-factory.name = Fabbrica Terrestre
 block.air-factory.name = Fabbrica Aerea
 block.naval-factory.name = Fabbrica Navale
-block.additive-reconstructor.name = Ricostruttore Adattivo
+block.additive-reconstructor.name = Ricostruttore Additivo
 block.multiplicative-reconstructor.name = Ricostruttore Moltiplicativo
 block.exponential-reconstructor.name = Ricostruttore Esponenziale
 block.tetrative-reconstructor.name = Ricostruttore Tetrattivo

From db0691f32fc827af8230718e3f6abcde72b85ebe Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az409-178.gl4i0ri3y5wexlajmgvk5xoqed.jx.internal.cloudapp.net>
Date: Sun, 7 May 2023 16:33:03 +0000
Subject: [PATCH 6/7] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 2 ++
 core/assets/bundles/bundle_bg.properties    | 2 ++
 core/assets/bundles/bundle_ca.properties    | 2 ++
 core/assets/bundles/bundle_cs.properties    | 2 ++
 core/assets/bundles/bundle_da.properties    | 2 ++
 core/assets/bundles/bundle_de.properties    | 2 ++
 core/assets/bundles/bundle_es.properties    | 2 ++
 core/assets/bundles/bundle_et.properties    | 2 ++
 core/assets/bundles/bundle_eu.properties    | 2 ++
 core/assets/bundles/bundle_fi.properties    | 2 ++
 core/assets/bundles/bundle_fil.properties   | 2 ++
 core/assets/bundles/bundle_fr.properties    | 2 ++
 core/assets/bundles/bundle_hu.properties    | 2 ++
 core/assets/bundles/bundle_id_ID.properties | 2 ++
 core/assets/bundles/bundle_it.properties    | 2 ++
 core/assets/bundles/bundle_ja.properties    | 2 ++
 core/assets/bundles/bundle_ko.properties    | 2 ++
 core/assets/bundles/bundle_lt.properties    | 2 ++
 core/assets/bundles/bundle_nl.properties    | 2 ++
 core/assets/bundles/bundle_nl_BE.properties | 2 ++
 core/assets/bundles/bundle_pl.properties    | 2 ++
 core/assets/bundles/bundle_pt_BR.properties | 2 ++
 core/assets/bundles/bundle_pt_PT.properties | 2 ++
 core/assets/bundles/bundle_ro.properties    | 2 ++
 core/assets/bundles/bundle_ru.properties    | 2 ++
 core/assets/bundles/bundle_sr.properties    | 2 ++
 core/assets/bundles/bundle_sv.properties    | 2 ++
 core/assets/bundles/bundle_th.properties    | 2 ++
 core/assets/bundles/bundle_tk.properties    | 2 ++
 core/assets/bundles/bundle_tr.properties    | 2 ++
 core/assets/bundles/bundle_uk_UA.properties | 2 ++
 core/assets/bundles/bundle_vi.properties    | 2 ++
 core/assets/bundles/bundle_zh_CN.properties | 2 ++
 core/assets/bundles/bundle_zh_TW.properties | 2 ++
 34 files changed, 68 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 344cc84b60..082a719f96 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -453,6 +453,8 @@ waves.sort.reverse = Рэверсіўнае Сартаванне
 waves.sort.begin = Пачатак
 waves.sort.health = Здароўе
 waves.sort.type = Тып
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Схаваць Усё
 waves.units.show = Паказаць Усё
 
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 74f242d72e..3e5bba870a 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index aa8f6c80db..ed19ebaf46 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Ordre invers
 waves.sort.begin = Comença
 waves.sort.health = Salut
 waves.sort.type = Tipus
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Amaga-les totes
 waves.units.show = Mostra-les totes
 
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 1f466d7906..2938c5dcc9 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Obrátit řazení
 waves.sort.begin = Začít
 waves.sort.health = Životy
 waves.sort.type = Typ
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Schovat vše
 waves.units.show = Zobrazit vše
 
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index c8fd5d1af9..b4eb633fdc 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 72ae4e2a7c..f22fa346d6 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -461,6 +461,8 @@ waves.sort.reverse = Reihenfolge umkehren
 waves.sort.begin = Anfang
 waves.sort.health = Lebenspunkte
 waves.sort.type = Sorte
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Alle verstecken
 waves.units.show = Alle anzeigen
 
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 2de2aeb941..e296025013 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Invertir orden
 waves.sort.begin = Inicio
 waves.sort.health = Vida
 waves.sort.type = Tipo
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Ocultar todo
 waves.units.show = Mostrar todo
 
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index e3db9a8acc..894e3222c2 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 74ec27b3c9..2e47f50f85 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -456,6 +456,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 7a55a6e548..74a28f1242 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Järjestä käänteisesti
 waves.sort.begin = Alkutaso
 waves.sort.health = Elämäpisteet
 waves.sort.type = Tyyppi
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Piilota kaikki
 waves.units.show = Näytä kaikki
 
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 690a9cf7a5..fd1aa8c608 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Pabaliktad na Sort
 waves.sort.begin = Simula
 waves.sort.health = Health
 waves.sort.type = Uri
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Itago lahat
 waves.units.show = Ipakita lahat
 
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 10672736c2..f3751cd082 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -462,6 +462,8 @@ waves.sort.reverse = Tri inversé
 waves.sort.begin = Vague
 waves.sort.health = Santé
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Masquer tout
 waves.units.show = Afficher tout
 
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index ced7a37130..1dece0fe43 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -457,6 +457,8 @@ waves.sort.reverse = Rendezés visszafelé
 waves.sort.begin = Begin
 waves.sort.health = Élet
 waves.sort.type = Típus
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 948310f2fa..cfdefefde6 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Urut Balik
 waves.sort.begin = Mulai
 waves.sort.health = Darah
 waves.sort.type = Tipe
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Sembunyikan Semua
 waves.units.show = Lihat Semua
 
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 366a0cf808..fe034bffa3 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -456,6 +456,8 @@ waves.sort.reverse = Inverti ordine
 waves.sort.begin = Inizia
 waves.sort.health = Salute
 waves.sort.type = Tipo
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Nascondi tutto
 waves.units.show = Mostra tutto
 
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 38af6215f0..d92ff76894 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = 降順
 waves.sort.begin = 開始
 waves.sort.health = 体力
 waves.sort.type = タイプ
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = すべて非表示
 waves.units.show = すべて表示
 
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index f9ffc80ba8..3e880da2af 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -457,6 +457,8 @@ waves.sort.reverse = 정렬 뒤집기
 waves.sort.begin = 시작 단계
 waves.sort.health = 체력
 waves.sort.type = 기체 유형
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = 모두 숨기기
 waves.units.show = 모두 보이기
 
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 4454117573..dbb15baa27 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index edd6fb019b..7cc8796352 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -462,6 +462,8 @@ waves.sort.reverse = Omgekeerd Sorteren
 waves.sort.begin = Begin
 waves.sort.health = Levenspunten
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Verberg Alle
 waves.units.show = Toon Alle
 
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index e09a1f6df9..a3b798a4a6 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index a7436fdb24..c2827b2535 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Odwrotne Sortowanie
 waves.sort.begin = Rozpocznij
 waves.sort.health = Zdrowie
 waves.sort.type = Typ
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Schowaj Wszystkie
 waves.units.show = Pokaż Wszystkie
 
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 409eae94a7..48eaaa5cef 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Inverter ordem
 waves.sort.begin = Começar
 waves.sort.health = Vida
 waves.sort.type = Tipo
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Esconder tudo
 waves.units.show = Mostrar tudo
 
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index b497ffc8cd..df5503d5b3 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index d83cc754a6..7a2e021cb3 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Inversează Sortarea
 waves.sort.begin = Început
 waves.sort.health = Viață
 waves.sort.type = Tip
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Ascunde
 waves.units.show = Vezi Tot
 
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index a3f905eea5..024dd8aad0 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Обратная сортировка
 waves.sort.begin = Начало
 waves.sort.health = Здоровье
 waves.sort.type = Тип
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Скрыть все
 waves.units.show = Показать все
 
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 386a7a57f6..8c65c947c6 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Suprotno Sortiraj
 waves.sort.begin = Početak
 waves.sort.health = Snaga
 waves.sort.type = Tip
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Sakrij Sve
 waves.units.show = Pokaži Sve
 
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 732d87cdfc..a009edd829 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index abb7516a18..8427770fa3 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = เรียงย้อนกลับ
 waves.sort.begin = เริ่มต้น
 waves.sort.health = พลังชีวิต
 waves.sort.type = ชนิด
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = ซ่อนทั้งหมด
 waves.units.show = แสดงทั้งหมด
 
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 29f41e8657..eeab973e54 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 1b88b54f42..94c4f1f4de 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = Ters Sırala
 waves.sort.begin = Başla
 waves.sort.health = Can
 waves.sort.type = Tür
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Hepsini Gizle
 waves.units.show = Hepsini Göster
 
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 812e34cc0a..5c439f40c1 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -460,6 +460,8 @@ waves.sort.reverse = Зворотне сортування
 waves.sort.begin = Хвилями
 waves.sort.health = Здоров’ям
 waves.sort.type = Типом
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Сховати все
 waves.units.show = Показати все
 
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 515f53b326..646ed73abd 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -459,6 +459,8 @@ waves.sort.reverse = Đảo ngược sắp xếp
 waves.sort.begin = Bắt đầu
 waves.sort.health = Máu
 waves.sort.type = Thể loại
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = Ẩn tất cả
 waves.units.show = Hiện tất cả
 
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index b23c52d0bb..0498d67681 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -461,6 +461,8 @@ waves.sort.reverse = 反向排序
 waves.sort.begin = 出场顺序
 waves.sort.health = 生命值
 waves.sort.type = 类型
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = 全部隐藏
 waves.units.show = 全部显示
 
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 44690eeeec..e8e24825b3 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -458,6 +458,8 @@ waves.sort.reverse = 反向排序
 waves.sort.begin = 開始
 waves.sort.health = 血量
 waves.sort.type = 兵種
+waves.search = Search waves...
+waves.filter.unit = Unit Filter
 waves.units.hide = 全部隱藏
 waves.units.show = 全部顯示
 

From 552353972e1677487dc89e39ceb30c93a6605a7c Mon Sep 17 00:00:00 2001
From: HamzaGSopp <104453337+HamzaGSopp@users.noreply.github.com>
Date: Mon, 8 May 2023 03:17:44 +0200
Subject: [PATCH 7/7] Update servers_v7.json (#8568)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 9948dbb232..34796e9833 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "Tamazia",
-    "address": ["83.150.217.98:25566"]
+    "address": ["83.150.217.98:25566", "83.150.217.98:25568"]
   },
   {
     "name": "RCM",