Merge remote-tracking branch 'origin/master'

2024-03-03 14:19:34 -05:00
parent ac15b94978 c0aef322d3
commit ed26bf18a7
36 changed files with 42 additions and 3 deletions
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1532,6 +1532,7 @@ block.inverted-sorter.name = Інвертаваны сартавальнік
 block.message.name = Паведамленне
 block.reinforced-message.name = Узмоцненнае Паведамленне
 block.world-message.name = Паведамленне Свету
+block.world-switch.name = World Switch
 block.illuminator.name = Асвятляльнік
 block.overflow-gate.name = Залішнi затвор
 block.underflow-gate.name = Залішнi шлюз
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -1543,6 +1543,7 @@ block.inverted-sorter.name = Обърнат сортирач
 block.message.name = Съобщение
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Осветител
 block.overflow-gate.name = Преливаща Порта
 block.underflow-gate.name = Обратна Преливаща Порта
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -1550,6 +1550,7 @@ block.inverted-sorter.name = Classificador invers
 block.message.name = Missatge
 block.reinforced-message.name = Missatge destacat
 block.world-message.name = Missatge mundial
+block.world-switch.name = World Switch
 block.illuminator.name = Il·luminador
 block.overflow-gate.name = Porta de desbordament
 block.underflow-gate.name = Porta de subdesbordament
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -1546,6 +1546,7 @@ block.inverted-sorter.name = Obrácená třídička
 block.message.name = Zpráva
 block.reinforced-message.name = Posílená Zpráva
 block.world-message.name = Světová Zpráva
+block.world-switch.name = World Switch
 block.illuminator.name = Osvětlovač
 block.overflow-gate.name = Brána s přepadem
 block.underflow-gate.name = Brána s podtokem
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Omvendt Filter
 block.message.name = Besked
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lyskilde
 block.overflow-gate.name = Overflods-låge
 block.underflow-gate.name = Underflods-låge
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -1560,6 +1560,7 @@ block.inverted-sorter.name = Invertierter Sortierer
 block.message.name = Nachricht
 block.reinforced-message.name = Verstärkte Nachricht
 block.world-message.name = Weltnachricht
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminierer
 block.overflow-gate.name = Überlauftor
 block.underflow-gate.name = Unterlauftor
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -1556,6 +1556,7 @@ block.inverted-sorter.name = Clasificador invertido
 block.message.name = Mensaje
 block.reinforced-message.name = Mensaje reforzado
 block.world-message.name = Mensaje estático
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminador
 block.overflow-gate.name = Compuerta de desborde
 block.underflow-gate.name = Compuerta de subdesbordamiento
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Sõnum
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Ülevooluvärav
 block.underflow-gate.name = Underflow Gate
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -1536,6 +1536,7 @@ block.inverted-sorter.name = Alderantzizko antolatzailea
 block.message.name = Mezua
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Gainezkatze atea
 block.underflow-gate.name = Underflow Gate
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1535,6 +1535,7 @@ block.inverted-sorter.name = Käänteinen Lajittelija
 block.message.name = Viesti
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lamppu
 block.overflow-gate.name = Ylivuotoportti
 block.underflow-gate.name = Alivuotoportti
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1533,6 +1533,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Overflow Gate
 block.underflow-gate.name = Underflow Gate
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1565,6 +1565,7 @@ block.inverted-sorter.name = Trieur Inversé
 block.message.name = Bloc de Message
 block.reinforced-message.name = Bloc de Message Renforcé
 block.world-message.name = Bloc de Message Global
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminateur
 block.overflow-gate.name = Barrière de Débordement
 block.underflow-gate.name = Barrière de Refoulement
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1566,6 +1566,7 @@ block.inverted-sorter.name = Inverz Válogató
 block.message.name = Üzenet
 block.reinforced-message.name = Megerősített Üzenet
 block.world-message.name = Világ Üzenet
+block.world-switch.name = World Switch
 block.illuminator.name = Világítótest
 block.overflow-gate.name = Alul-folyó Kapu
 block.underflow-gate.name = Túlfolyó Kapu
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -1556,6 +1556,7 @@ block.inverted-sorter.name = Penyortir Terbalik
 block.message.name = Pesan
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lampu
 block.overflow-gate.name = Gerbang Luap
 block.underflow-gate.name = Gerbang Luap Terbalik
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -1544,6 +1544,7 @@ block.inverted-sorter.name = Filtro Inverso
 block.message.name = Messaggio
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lanterna
 block.overflow-gate.name = Separatore per Eccesso
 block.underflow-gate.name = Separatore per Eccesso Inverso
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1547,6 +1547,7 @@ block.inverted-sorter.name = 反転ソーター
 block.message.name = メッセージブロック
 block.reinforced-message.name = 強化されたメッセージブロック
 block.world-message.name = ワールドメッセージブロック
+block.world-switch.name = World Switch
 block.illuminator.name = イルミネーター
 block.overflow-gate.name = オーバーフローゲート
 block.underflow-gate.name = アンダーフローゲート
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -1546,6 +1546,7 @@ block.inverted-sorter.name = 반전 필터
 block.message.name = 메모 블록
 block.reinforced-message.name = 보강된 메모 블록
 block.world-message.name = 월드 메모 블록
+block.world-switch.name = World Switch
 block.illuminator.name = 조명
 block.overflow-gate.name = 포화 필터
 block.underflow-gate.name = 불포화 필터
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Atbulinis Rūšiuotojas
 block.message.name = Žinutė
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Šviestuvas
 block.overflow-gate.name = Perpildymo Užtvara
 block.underflow-gate.name = Neperpildymo Užtvara
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -1546,6 +1546,7 @@ block.inverted-sorter.name = Omgekeerder Sorteerder
 block.message.name = Bericht
 block.reinforced-message.name = Gepansterd Bericht
 block.world-message.name = Wereldbericht
+block.world-switch.name = World Switch
 block.illuminator.name = Lamp
 block.overflow-gate.name = Overstroom Poort
 block.underflow-gate.name = Onderstroom Poort
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Overflow Gate
 block.underflow-gate.name = Underflow Gate
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -1553,6 +1553,7 @@ block.inverted-sorter.name = Odwrotny Sortownik
 block.message.name = Wiadomość
 block.reinforced-message.name = Wzmocniona Wiadomość
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Rozświetlacz
 block.overflow-gate.name = Brama Przepełnieniowa
 block.underflow-gate.name = Brama Niedomiaru
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1553,6 +1553,7 @@ block.inverted-sorter.name = Ordenador invertido
 block.message.name = Mensagem
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminador
 block.overflow-gate.name = Portão de Sobrecarga
 block.underflow-gate.name = Portão de Sobrecarga Invertido
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Mensagem
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Portão Sobrecarregado
 block.underflow-gate.name = Portão Desobrecarregado
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -1547,6 +1547,7 @@ block.inverted-sorter.name = Sortator Invers
 block.message.name = Mesaj
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminator
 block.overflow-gate.name = Poartă de Revărsare
 block.underflow-gate.name = Poartă de Subversare
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1547,6 +1547,7 @@ block.inverted-sorter.name = Инвертированный сортировщи
 block.message.name = Сообщение
 block.reinforced-message.name = Усиленное сообщение
 block.world-message.name = Мировое сообщение
+block.world-switch.name = World Switch
 block.illuminator.name = Осветитель
 block.overflow-gate.name = Избыточный затвор
 block.underflow-gate.name = Избыточный шлюз
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -1549,6 +1549,7 @@ block.inverted-sorter.name = Naopaki Sorter
 block.message.name = Poruka
 block.reinforced-message.name = Armirana Poruka
 block.world-message.name = Svetovna Poruka
+block.world-switch.name = World Switch
 block.illuminator.name = Svetlo
 block.overflow-gate.name = Prelivna Kapija
 block.underflow-gate.name = Podlivna Kapija
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Meddelande
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Överflödesgrind
 block.underflow-gate.name = Underflow Gate
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -1554,6 +1554,7 @@ block.inverted-sorter.name = เครื่องคัดแยกกลับ
 block.message.name = กล่องข้อความ
 block.reinforced-message.name = กล่องข้อความเสริมกำลัง
 block.world-message.name = กล่องข้อความโลก
+block.world-switch.name = World Switch
 block.illuminator.name = ตัวเปล่งแสง
 block.overflow-gate.name = ประตูระบาย
 block.underflow-gate.name = ประตูระบายข้าง
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Kapali dagatici
 block.underflow-gate.name = Underflow Gate
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -1545,6 +1545,7 @@ block.inverted-sorter.name = Ters Ayıklayıcı
 block.message.name = Mesaj Bloğu
 block.reinforced-message.name = Güçlendirilmiş Mesaj Bloğu
 block.world-message.name = Evrensel Mesaj Bloğu
+block.world-switch.name = World Switch
 block.illuminator.name = Aydınlatıcı
 block.overflow-gate.name = Taşma Geçidi
 block.underflow-gate.name = Yana Taşma Geçidi
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -1558,6 +1558,7 @@ block.inverted-sorter.name = Зворотний сортувальник
 block.message.name = Повідомлення
 block.reinforced-message.name = Посилене повідомлення
 block.world-message.name = Світове повідомлення
+block.world-switch.name = World Switch
 block.illuminator.name = Освітлювач
 block.overflow-gate.name = Надмірний затвор
 block.underflow-gate.name = Недостатній затвор
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1549,6 +1549,7 @@ block.inverted-sorter.name = Bộ lọc ngược
 block.message.name = Thông điệp
 block.reinforced-message.name = Thông điệp [Gia cố]
 block.world-message.name = Thông điệp thế giới
+block.world-switch.name = World Switch
 block.illuminator.name = Đèn
 block.overflow-gate.name = Cổng tràn
 block.underflow-gate.name = Cổng tràn ngược
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1559,6 +1559,7 @@ block.inverted-sorter.name = 反向分类器
 block.message.name = 信息板
 block.reinforced-message.name = 强化信息板
 block.world-message.name = 世界信息板
+block.world-switch.name = World Switch
 block.illuminator.name = 照明器
 block.overflow-gate.name = 溢流门
 block.underflow-gate.name = 反向溢流门
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -1555,6 +1555,7 @@ block.inverted-sorter.name = 反向分類器
 block.message.name = 訊息板
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = 照明燈
 block.overflow-gate.name = 溢流器
 block.underflow-gate.name = 反向溢流器
--- a/core/src/mindustry/logic/LAccess.java
+++ b/core/src/mindustry/logic/LAccess.java
@@ -67,7 +67,7 @@ public enum LAccess{
        all = values(),
        senseable = Seq.select(all, t -> t.params.length <= 1).toArray(LAccess.class),
        controls = Seq.select(all, t -> t.params.length > 0).toArray(LAccess.class),
-        settable = {x, y, rotation, speed, armor, health, team, flag, totalPower, payloadType};
+        settable = {x, y, rotation, speed, armor, health, shield, team, flag, totalPower, payloadType};

    LAccess(String... params){
        this.params = params;
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -3,6 +3,11 @@
    "name": "STP",
    "address": ["23.88.73.88:25617"]
  },
+  {
+    "name": "Meow Empire ≫ MEM PROJECT",
+    "address": ["a2.corenodes.host:25514"]
+
+  },
  {
    "name" : "LesGarsCools",
    "address": ["est1.be"]
@@ -133,7 +138,7 @@
  },
  {
    "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.100.100.249:7000", "77.100.100.249:7001", "77.100.100.249:7002", "141.148.196.135:7000", "130.61.220.99:7000", "130.61.220.99:7001"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.100.100.249:7000", "77.100.100.249:7001", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004"]
  },
  {
    "name": "Conservatory",
@@ -222,7 +227,7 @@
  },
  {
    "name": "MeowIsland",
-    "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651", "orion.minecraft.rent:25573"]
+    "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651", "pandora.minecraft.rent:25620"]
  },
  {
    "name": "3MIDustry",