Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_be.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Адсочваць гульца
 trace.playername = Iмя гульца: [accent]{0}

core/assets/bundles/bundle_bg.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Публичните сървъри [accent]не[] са п
 servers.showhidden = Покажи Скритите Сървъри
 server.shown = Показан
 server.hidden = Скрит
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Проследи Играч
 trace.playername = Име на играча: [accent]{0}

core/assets/bundles/bundle_cs.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Komunitní servery [accent]nejsou[] vlastněny ani kontrolo
 servers.showhidden = Zobraz skryté servery
 server.shown = Zobrazené
 server.hidden = Skryté
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Vystopovat hráče
 trace.playername = Jméno hráče: [accent]{0}[]

core/assets/bundles/bundle_da.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Følg spiller
 trace.playername = Spiller-navn: [accent]{0}

core/assets/bundles/bundle_de.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Community-Server werden vom Entwickler [accent]nicht[] gepr
 servers.showhidden = Versteckte Server anzeigen
 server.shown = Angezeigt
 server.hidden = Versteckt
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Spieler verfolgen
 trace.playername = Spielername: [accent]{0}

core/assets/bundles/bundle_es.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Los servidores de la comunidad [accent]no[] son propiedad d
 servers.showhidden = Mostrar servidores ocultos
 server.shown = Visibles
 server.hidden = Ocultos
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Rastrear Jugador
 trace.playername = Nombre del jugador: [accent]{0}

core/assets/bundles/bundle_et.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Jälita mängijat
 trace.playername = Mängija nimi: [accent]{0}

core/assets/bundles/bundle_eu.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Trazatu jokalaria
 trace.playername = Jokalariaren izena: [accent]{0}

core/assets/bundles/bundle_fi.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Yhteisön palvelimet [accent]eivät ole[] kehittäjän omis
 servers.showhidden = Näytä piilotetut palvelimet
 server.shown = Näytetty
 server.hidden = Piilotettu
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Seuraa pelaajaa
 trace.playername = Pelaajanimi: [accent]{0}

core/assets/bundles/bundle_fil.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Ang mga server ng komunidad ay [accent]hindi pagmamay-ari o
 servers.showhidden = Show Hidden Servers
 server.shown = Ipinapakita
 server.hidden = Tinatago
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Trace Player
 trace.playername = Pangalan ng Player: [accent]{0}

core/assets/bundles/bundle_hu.properties

@@ -230,6 +230,7 @@ servers.disclaimer = A közösségi szervereket [accent]nem[] a fejlesztő birto
 servers.showhidden = Rejtett szerverek megjelenítése
 server.shown = Látható
 server.hidden = Rejtett
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Játékos követése
 trace.playername = Játékos neve: [accent]{0}

core/assets/bundles/bundle_id_ID.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Server komunitas [accent]tidak[] dimiliki atau diatur oleh
 servers.showhidden = Tampilkan Server Tersembunyi
 server.shown = Ditampilkan
 server.hidden = Disembunyikan
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Lacak Pemain
 trace.playername = Nama pemain: [accent]{0}

core/assets/bundles/bundle_it.properties

@@ -229,6 +229,7 @@ servers.disclaimer = I server della Community [accent]non[] appartengono o sono
 servers.showhidden = Mostra Server Nascosti
 server.shown = Visibile
 server.hidden = Nascosto
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Traccia Giocatore
 trace.playername = Nome del Giocatore: [accent]{0}

core/assets/bundles/bundle_ja.properties

@@ -231,6 +231,7 @@ servers.disclaimer = コミュニティサーバーは、[accent]開発者が所
 servers.showhidden = 非表示のサーバーを表示する
 server.shown = 表示
 server.hidden = 非表示
+viewplayer = Viewing Player: [accent]{0}
 
 trace = プレイヤーの記録
 trace.playername = プレイヤー名: [accent]{0}

core/assets/bundles/bundle_ko.properties

@@ -231,6 +231,7 @@ servers.disclaimer = 커뮤니티 서버는 개발자가 소유하거나 제어
 servers.showhidden = 숨겨진 서버 보이기/숨기기
 server.shown = 서버 숨기기
 server.hidden = 서버 보이기
+viewplayer = Viewing Player: [accent]{0}
 
 trace = 플레이어 정보 보기
 trace.playername = 플레이어 이름: [accent]{0}

core/assets/bundles/bundle_lt.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Sekti Žaidėją
 trace.playername = Žaidėjo vardas: [accent]{0}

core/assets/bundles/bundle_nl.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Toon Verborgen Servers
 server.shown = Weergegeven
 server.hidden = Verborgen
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Traceer Speler
 trace.playername = Speler naam: [accent]{0}

core/assets/bundles/bundle_nl_BE.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Spelersinformatie
 trace.playername = Naam: [accent]{0}

core/assets/bundles/bundle_pl.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Serwery społeczności [accent]nie są[] w posiadaniu ani n
 servers.showhidden = Pokaż Ukryte Serwery
 server.shown = Pokazane
 server.hidden = Ukryte
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Zlokalizuj Gracza
 trace.playername = Nazwa gracza: [accent]{0}

core/assets/bundles/bundle_pt_BR.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Servidores da comunidade [accent]não[] controlados pelo de
 servers.showhidden = Mostrar servidores escondidos
 server.shown = Mostrar
 server.hidden = Esconder
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Rastrear jogador
 trace.playername = Nome do jogador: [accent]{0}

core/assets/bundles/bundle_pt_PT.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Traçar jogador
 trace.playername = Nome do jogador: [accent]{0}

core/assets/bundles/bundle_ro.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Serverele comunității [accent]nu[] sunt deținute sau con
 servers.showhidden = Vezi Serverele Ascunse
 server.shown = Afișate
 server.hidden = Ascunse
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Urmărește Jucător
 trace.playername = Nume jucător: [accent]{0}

core/assets/bundles/bundle_ru.properties

@@ -230,6 +230,7 @@ servers.disclaimer = Серверы сообщества [accent]не[] прин
 servers.showhidden = Отображать скрытые серверы
 server.shown = Отображается
 server.hidden = Скрыт
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Отслеживать игрока
 trace.playername = Имя игрока: [accent]{0}

core/assets/bundles/bundle_sr.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Zadružni serveri [accent]nisu[] pod vlasništvom ili uprav
 servers.showhidden = Prikaži Skrivene Servere
 server.shown = Prikazano
 server.hidden = Skriveno
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Trace Player
 trace.playername = Player name: [accent]{0}

core/assets/bundles/bundle_sv.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Gemenskaps servrar är [accent]inte[] ägda eller kontrolle
 servers.showhidden = Visa Dolda Servrar
 server.shown = Visade
 server.hidden = Dolda
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Trace Player
 trace.playername = Spelarnamn: [accent]{0}

core/assets/bundles/bundle_th.properties

@@ -231,6 +231,7 @@ servers.disclaimer = ผู้พัฒนา[accent]ไม่ได้[]เป
 servers.showhidden = แสดงเซิร์ฟเวอร์ที่ซ่อนไว้
 server.shown = แสดง
 server.hidden = ซ่อน
+viewplayer = Viewing Player: [accent]{0}
 
 trace = แกะรอยผู้เล่น
 trace.playername = ชื่อผู้เล่น: [accent]{0}

core/assets/bundles/bundle_tk.properties

@@ -227,6 +227,7 @@ servers.disclaimer = Community servers are [accent]not[] owned or controlled by
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Oyuncu isaretle
 trace.playername = Player name: [accent]{0}

core/assets/bundles/bundle_tr.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Topluluk Sunucuları, [accent]Yapımcı tarafından yöneti
 servers.showhidden = Gizli Sunucuları Göster
 server.shown = Görünür
 server.hidden = Gizli
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Oyuncuyu Takip Et
 trace.playername = Oyuncu İsmi: [accent]{0}

core/assets/bundles/bundle_uk_UA.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Сервери спільноти [accent]не[] належ
 servers.showhidden = Показати приховані сервери
 server.shown = Показано
 server.hidden = Приховано
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Стежити за гравцем
 trace.playername = Ім’я гравця: [accent]{0}

core/assets/bundles/bundle_vi.properties

@@ -231,6 +231,7 @@ servers.disclaimer = Nhà phát triển [accent]không[] sở hữu và kiểm s
 servers.showhidden = Hiển thị Máy chủ Ẩn
 server.shown = Hiện
 server.hidden = Ẩn
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Tìm người chơi
 trace.playername = Tên người chơi: [accent]{0}

core/assets/bundles/bundle_zh_CN.properties

@@ -231,6 +231,7 @@ servers.disclaimer = 社区服务器[accent]并非[]由开发者拥有或管理
 servers.showhidden = 显示隐藏的服务器
 server.shown = 显示
 server.hidden = 隐藏
+viewplayer = Viewing Player: [accent]{0}
 
 trace = 跟踪玩家
 trace.playername = 玩家名称：[accent]{0}

core/assets/bundles/bundle_zh_TW.properties

@@ -231,6 +231,7 @@ servers.disclaimer = 社群伺服器[accent]不是[]由開發者擁有或管理
 servers.showhidden = 顯示被隱藏的伺服器
 server.shown = 已顯示
 server.hidden = 已隱藏
+viewplayer = Viewing Player: [accent]{0}
 
 trace = 追蹤玩家
 trace.playername = 玩家名稱：[accent]{0}

core/src/mindustry/entities/part/DrawPart.java

@@ -124,6 +124,10 @@ public abstract class DrawPart{
             return p -> get(p) / (1f - amount);
         }
 
+        default PartProgress compress(float start, float end){
+            return p -> Mathf.curve(get(p), start, end);
+        }
+
         default PartProgress blend(PartProgress other, float amount){
             return p -> Mathf.lerp(get(p), other.get(p), amount);
         }

core/src/mindustry/mod/ContentParser.java

@@ -201,13 +201,14 @@ public class ContentParser{
                 case "delay" -> base.delay(data.getFloat("amount"));
                 case "sustain" -> base.sustain(data.getFloat("offset", 0f), data.getFloat("grow", 0f), data.getFloat("sustain"));
                 case "shorten" -> base.shorten(data.getFloat("amount"));
+                case "compress" -> base.compress(data.getFloat("start"), data.getFloat("end"));
                 case "add" -> data.has("amount") ? base.add(data.getFloat("amount")) : base.add(parser.readValue(PartProgress.class, data.get("other")));
                 case "blend" -> base.blend(parser.readValue(PartProgress.class, data.get("other")), data.getFloat("amount"));
-                case "mul" -> base.mul(parser.readValue(PartProgress.class, data.get("other")));
+                case "mul" -> data.has("amount") ? base.mul(data.getFloat("amount")) : base.mul(parser.readValue(PartProgress.class, data.get("other")));
                 case "min" -> base.min(parser.readValue(PartProgress.class, data.get("other")));
-                case "sin" -> base.sin(data.getFloat("scl"), data.getFloat("mag"));
+                case "sin" -> base.sin(data.has("offset") ? data.getFloat("offset") : 0f, data.getFloat("scl"), data.getFloat("mag"));
                 case "absin" -> base.absin(data.getFloat("scl"), data.getFloat("mag"));
-                case "curve" -> base.curve(parser.readValue(Interp.class, data.get("interp")));
+                case "curve" -> data.has("interp") ? base.curve(parser.readValue(Interp.class, data.get("interp"))) : base.curve(data.getFloat("offset"), data.getFloat("duration"));
                 default -> throw new RuntimeException("Unknown operation '" + op + "', check PartProgress class for a list of methods.");
             };
         });

servers_be.json

@@ -1,6 +1,7 @@
 [
   {
-    "address": "be.mindustry.nydus.app:6567"
+    "name": "Nydus",
+    "address": ["be.mindustry.nydus.app:6567", "be.mindustry.nydus.app:6568"]
   },
   {
     "name": "mindustry.pl",

servers_v6.json

@@ -9,7 +9,7 @@
   },
   {
     "name": "Omega Hub",
-    "address": ["n1.yeet.ml", "n1.yeet.ml:6568","n1.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571"]
+    "address": ["n1.yeet.ml", "n1.yeet.ml:6568","n1.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571", "n1.yeet.ml:6609"]
   },
   {
     "name": "RCM",
@@ -67,10 +67,6 @@
     "name": "Korea",
     "address": ["mindustry.initd.kr","mindustry.kr:7100"]
   },
-  {
-    "name": "Omega",
-    "address": ["omegav.mindustry.me:6572"] 
-  },
   {
     "name": "Obvilion Network",
     "address": ["obvilion.ru", "obvilion.ru:7001", "obvilion.ru:7002", "obvilion.ru:7003"]

servers_v7.json

@@ -22,7 +22,7 @@
   },
   {
     "name": "Omega Hub",
-    "address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n1.yeet.ml:6605"]
+    "address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n1.yeet.ml:6605", "n1.yeet.ml:6608"]
   },
   {
     "name": "KMWStudios",
@@ -30,7 +30,7 @@
   },
   {
     "name": "Darkdustry",
-    "address": ["darkdustry.tk", "darkdustry.tk:5000", "darkdustry.tk:6000", "darkdustry.tk:7000", "darkdustry.tk:8000", "darkdustry.tk:9000"] 
+    "address": ["darkdustry.tk", "darkdustry.tk:1500", "darkdustry.tk:2000", "darkdustry.tk:3000", "darkdustry.tk:4000", "darkdustry.tk:5000", "darkdustry.tk:6000", "darkdustry.tk:7000", "darkdustry.tk:8000", "darkdustry.tk:9000"] 
   },
   {
     "name": "Chaotic Neutral",