Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2026-01-11 14:48:52 -05:00
parent e4c2397097 dc5921b988
commit 038b549e03
37 changed files with 163 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle_be.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_bg.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_ca.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_cs.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atoly
sector.testingGrounds.name = Testovací zázemí
sector.seaPort.name = Mořský přístav
sector.weatheredChannels.name = Zvětralé údolí
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Pevnost podhoubí
sector.frontier.name = Fronta
sector.sunkenPier.name = Potopené molo
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_da.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_de.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolle
sector.testingGrounds.name = Testgelände
sector.seaPort.name = Hafen
sector.weatheredChannels.name = Verwitterte Kanäle
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Myzel-Festung
sector.frontier.name = Frontlinie
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_es.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolones
sector.testingGrounds.name = Campo de Pruebas
sector.seaPort.name = Puerto Marítimo
sector.weatheredChannels.name = Canales Erosionados
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Bastión Infestado
sector.frontier.name = Frontera
sector.sunkenPier.name = Muelle Hundido
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_et.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_eu.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_fi.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_fil.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_fr.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_hu.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atollok
sector.testingGrounds.name = Gyakorlótér
sector.seaPort.name = Tengeri kikötő
sector.weatheredChannels.name = Viharvert csatornák
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Micéliumbástya
sector.frontier.name = Frontvidék
sector.sunkenPier.name = Elsüllyedt móló
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_id_ID.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atol
sector.testingGrounds.name = Kawasan Uji Coba
sector.seaPort.name = Pelabuhan Laut
sector.weatheredChannels.name = Selat Terkikis
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Benteng Pertahanan Miselium
sector.frontier.name = Perbatasan
sector.sunkenPier.name = Dermaga Karam
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_it.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_ja.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = 環礁
sector.testingGrounds.name = 実験地
sector.seaPort.name = 港
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = 辺境辺境
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_ko.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = 환초섬
sector.testingGrounds.name = 시험장
sector.seaPort.name = 바다 항구
sector.weatheredChannels.name = 풍화된 수로
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = 균사 성채
sector.frontier.name = 국경 지방
sector.sunkenPier.name = 가라앉은 부두
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_lt.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_nl.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_nl_BE.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_pl.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_pt_BR.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_pt_PT.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_ro.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_ru.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Атоллы
sector.testingGrounds.name = Испытательные площадки
sector.seaPort.name = Морской порт
sector.weatheredChannels.name = Размытые протоки
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Мицелиальный бастион
sector.frontier.name = Граница
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_sr.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_sv.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_th.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = อะทอลส์
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_tk.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_tr.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atoller
sector.testingGrounds.name = Test Arazisi
sector.seaPort.name = Deniz Limanı
sector.weatheredChannels.name = Erezyonlu Kanallar
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mantar Kale
sector.frontier.name = Öncü Üs
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_uk_UA.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_vi.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_zh_CN.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = 环礁群岛
sector.testingGrounds.name = 实验禁区
sector.seaPort.name = 边海港口
sector.weatheredChannels.name = 风化海峡
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = 菌丝堡垒
sector.frontier.name = 边陲哨站
sector.sunkenPier.name = 沉没码头
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP，map submission by hhh i 17
sector.testingGrounds.description = WIP，map submission by dnx2019
sector.seaPort.description = WIP，map submission by inkognito626
sector.weatheredChannels.description = WIP，map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP，map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/bundles/bundle_zh_TW.properties
+2
View File
@@ -887,6 +887,7 @@ sector.atolls.name = Atolls
sector.testingGrounds.name = Testing Grounds
sector.seaPort.name = Sea Port
sector.weatheredChannels.name = Weathered Channels
sector.fallenVessel.name = Fallen Vessel
sector.mycelialBastion.name = Mycelial Bastion
sector.frontier.name = Frontier
sector.sunkenPier.name = Sunken Pier
@@ -923,6 +924,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
sector.testingGrounds.description = WIP, map submission by dnx2019
sector.seaPort.description = WIP, map submission by inkognito626
sector.weatheredChannels.description = WIP, map submission by Skeledragon
sector.fallenVessel.description = WIP, map submission
sector.mycelialBastion.description = WIP, map submission by Skeledragon
sector.cruxscape.description = WIP, map submission by Stormride_R
sector.geothermalStronghold.description = WIP, map submission by Skeledragon
core/assets/contributors
+2 -1
View File
@@ -187,4 +187,5 @@ Iniquit
DSFdsfWxp
Someone's Shadow
buj
Agzam4
Agzam4
ItsKirby69
core/assets/sounds/ui/uiFavorite.ogg
BIN
View File
Binary file not shown.
core/src/mindustry/ui/fragments/HudFragment.java
+93 -3
View File
@@ -14,6 +14,7 @@ import arc.scene.ui.ImageButton.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import arc.input.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
@@ -54,6 +55,9 @@ public class HudFragment{
private Seq<Block> blocksOut = new Seq<>();
private Table hudLabel;
private static ObjectSet<String> favoriteBlocks = new ObjectSet<>();
private static String lastFavorited = null;
private void addBlockSelection(Table cont){
Table blockSelection = new Table();
var pane = new ScrollPane(blockSelection, Styles.smallPane);
@@ -100,12 +104,53 @@ public class HudFragment{
rebuildBlockSelection(blockSelection, "");
}
private static void loadFavorites(){
favoriteBlocks = Core.settings.getJson("editor-block-favorites", ObjectSet.class, String.class, ObjectSet::new);
}
private static void saveFavorites(){
Core.settings.putJson("editor-block-favorites", String.class, favoriteBlocks);
}
private static boolean isFavorite(Block block){
return favoriteBlocks.contains(block.name);
}
private static void toggleFavorite(Block block){
boolean isFav = favoriteBlocks.contains(block.name);
if(isFav){
favoriteBlocks.remove(block.name);
Sounds.uiFavorite.play(0.35f, 0.67f, 0f);
}else{
favoriteBlocks.add(block.name);
lastFavorited = block.name;
Sounds.uiFavorite.play(0.6f, 2.0f, 0f);
}
saveFavorites();
}
private void rebuildBlockSelection(Table blockSelection, String searchText){
blockSelection.clear();
blocksOut.clear();
blocksOut.addAll(Vars.content.blocks());
// Favorites first
for(Block block : Vars.content.blocks()){
if(isFavorite(block)){
blocksOut.add(block);
}
}
for(Block block : Vars.content.blocks()){
if(!isFavorite(block)){
blocksOut.add(block);
}
}
blocksOut.sort((b1, b2) -> {
// These two block should stay at the top
if(b1 == Blocks.removeOre || b1 == Blocks.removeWall) return -1;
if(b2 == Blocks.removeOre || b2 == Blocks.removeWall) return 1;
int fav = Boolean.compare(isFavorite(b2), isFavorite(b1));
if(fav != 0) return fav;
int synth = Boolean.compare(b1.synthetic(), b2.synthetic());
if(synth != 0) return synth;
int ore = Boolean.compare(b1 instanceof OverlayFloor && b1 != Blocks.removeOre, b2 instanceof OverlayFloor && b2 != Blocks.removeOre);
@@ -128,9 +173,54 @@ public class HudFragment{
ImageButton button = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);
button.getStyle().imageUp = new TextureRegionDrawable(region);
button.clicked(() -> control.input.block = block);
// Pc input for favorites
button.clicked(KeyCode.mouseRight, () -> {
if(block == Blocks.removeOre || block == Blocks.removeWall) return;
toggleFavorite(block);
rebuildBlockSelection(blockSelection, searchText);
control.input.block = block;
});
// Mobile double-click for favorites
button.addListener(new ClickListener(){
@Override
public void clicked(InputEvent event, float x, float y){
if(mobile && getTapCount() == 2){
if(block == Blocks.removeOre || block == Blocks.removeWall) return;
toggleFavorite(block);
rebuildBlockSelection(blockSelection, searchText);
control.input.block = block;
}
}
});
button.resizeImage(8 * 4f);
button.update(() -> button.setChecked(control.input.block == block));
blockSelection.add(button).size(48f).tooltip(block.localizedName);
Stack stack = new Stack();
stack.add(button);
if(isFavorite(block)){
Image favIcon = new Image(Icon.star);
favIcon.setColor(Color.gold);
favIcon.setOrigin(Align.center);
if(block.name.equals(lastFavorited)){
favIcon.color.a = 0f;
favIcon.setScale(0f);
favIcon.addAction(Actions.parallel(
Actions.scaleTo(0.7f, 0.7f, 0.2f),
Actions.alpha(1f, 0.2f),
Actions.run(() -> lastFavorited = null)
));
}else{
favIcon.setScale(0.7f);
}
Table overlay = new Table().align(Align.topRight);
overlay.touchable = Touchable.disabled;
overlay.add(favIcon).size(2f).pad(12f);
stack.add(overlay);
}
blockSelection.add(stack).size(48f).tooltip(block.localizedName);
if(++i % 6 == 0){
blockSelection.row();
@@ -143,7 +233,7 @@ public class HudFragment{
}
public void build(Group parent){
loadFavorites();
//warn about guardian/boss waves
Events.on(WaveEvent.class, e -> {
int max = 10;