From f4bf76e3b23b0bb86103bac1c04e39c8ab4e5501 Mon Sep 17 00:00:00 2001 From: Joan Josep Date: Fri, 13 Oct 2023 15:23:14 +0200 Subject: [PATCH 1/7] Update bundle_ca.properties (#9158) --- core/assets/bundles/bundle_ca.properties | 76 ++++++++++++------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties index 268f751481..c222cc0c38 100644 --- a/core/assets/bundles/bundle_ca.properties +++ b/core/assets/bundles/bundle_ca.properties @@ -348,15 +348,15 @@ command.rebuild = Reconstrueix command.assist = Assisteix al jugador command.move = Mou command.boost = Sobrevola -command.loadUnits = Load Units -command.loadBlocks = Load Blocks -command.unloadPayload = Unload Payload -stance.stop = Cancel Orders -stance.shoot = Stance: Shoot -stance.holdfire = Stance: Hold Fire -stance.pursuetarget = Stance: Pursue Target -stance.patrol = Stance: Patrol Path -stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding +command.loadUnits = Carrega unitats +command.loadBlocks = Carrega blocs +command.unloadPayload = Descarrega +stance.stop = Cancel·la les ordres +stance.shoot = Comportament: Dispara +stance.holdfire = Comportament: Mantén el foc +stance.pursuetarget = Comportament: Persegueix l’objectiu +stance.patrol = Comportament: Patrulla el camí +stance.ram = Comportament: Senzill\n[lightgray]Mou-te en línia recta, sense encaminador openlink = Obre l’enllaç copylink = Copia l’enllaç back = Enrere @@ -655,7 +655,7 @@ marker.shapetext.name = Forma del text marker.minimap.name = Minimapa marker.shape.name = Forma marker.text.name = Text -marker.line.name = Line +marker.line.name = Línia marker.background = Fons marker.outline = Contorn @@ -970,9 +970,9 @@ ability.movelightning = Moviment llampec ability.shieldarc = Escut de descàrregues ability.suppressionfield = Regen Suppression Field ability.energyfield = Camp de força -ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}% -ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0} -ability.regen = Regeneration +ability.energyfield.sametypehealmultiplier = [lightgray]Mateix tipus de guarició: [white]{0} % +ability.energyfield.maxtargets = [lightgray]Objectius màx.: [white]{0} +ability.regen = Regeneració bar.onlycoredeposit = Només es permet depositar al nucli. bar.drilltierreq = Cal una perforadora millor. @@ -1067,7 +1067,7 @@ setting.backgroundpause.name = Pausa automàtica quan s’estigui en segon pla setting.buildautopause.name = Pausa automàtica quan es construeixi setting.doubletapmine.name = Dos tocs/clics per a extreure recursos setting.commandmodehold.name = Mantén per al mode de comandament -setting.distinctcontrolgroups.name = Limit One Control Group Per Unit +setting.distinctcontrolgroups.name = Limita a un grup de control per unitat setting.modcrashdisable.name = Desactiva els mods quan no es pugui iniciar el joc setting.animatedwater.name = Animacions del terreny setting.animatedshields.name = Animacions dels escuts @@ -1114,7 +1114,7 @@ setting.position.name = Mostra la posició del jugador setting.mouseposition.name = Mostra la posició del ratolí setting.musicvol.name = Volum de la música setting.atmosphere.name = Mostra l’atmosfera del planeta -setting.drawlight.name = Draw Darkness/Lighting +setting.drawlight.name = Dibuixa la foscor/llum setting.ambientvol.name = Volum del so ambiental setting.mutemusic.name = Silencia la música setting.sfxvol.name = Volums dels efectes de so @@ -1141,7 +1141,7 @@ keybind.title = Personalització dels controls keybinds.mobile = [scarlet]La majoria de dreceres no estan disponibles en les versions per a pantalles tàctils. Només està inclòs el moviment bàsic. category.general.name = General category.view.name = Control de la vista i altres -category.command.name = Unit Command +category.command.name = Ordre d’unitat category.multiplayer.name = Multijugador category.blocks.name = Selecció d’estructures per construir placement.blockselectkeys = \n[lightgray]Tecles: [{0}, @@ -1159,23 +1159,23 @@ keybind.mouse_move.name = Segueix el ratolí keybind.pan.name = Desplaça la vista keybind.boost.name = Sobrevola keybind.command_mode.name = Mode de comandament -keybind.command_queue.name = Unit Command Queue -keybind.create_control_group.name = Create Control Group -keybind.cancel_orders.name = Cancel Orders -keybind.unit_stance_shoot.name = Unit Stance: Shoot -keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire -keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target -keybind.unit_stance_patrol.name = Unit Stance: Patrol -keybind.unit_stance_ram.name = Unit Stance: Ram -keybind.unit_command_move = Unit Command: Move -keybind.unit_command_repair = Unit Command: Repair -keybind.unit_command_rebuild = Unit Command: Rebuild -keybind.unit_command_assist = Unit Command: Assist -keybind.unit_command_mine = Unit Command: Mine -keybind.unit_command_boost = Unit Command: Boost -keybind.unit_command_load_units = Unit Command: Load Units -keybind.unit_command_load_blocks = Unit Command: Load Blocks -keybind.unit_command_unload_payload = Unit Command: Unload Payload +keybind.command_queue.name = Cua d’ordres d’unitat +keybind.create_control_group.name = Crea un grup de control +keybind.cancel_orders.name = Cancel·la les ordres +keybind.unit_stance_shoot.name = Comportament: Dispara +keybind.unit_stance_hold_fire.name = Comportament: Mantén el foc +keybind.unit_stance_pursue_target.name = Comportament: Persegueix l’objectiu +keybind.unit_stance_patrol.name = Comportament: Patrulla +keybind.unit_stance_ram.name = Comportament: Senzill +keybind.unit_command_move = Comportament: Mou +keybind.unit_command_repair = Comportament: Repara +keybind.unit_command_rebuild = Comportament: Reconstrueix +keybind.unit_command_assist = Comportament: Assisteix +keybind.unit_command_mine = Comportament: Extrau +keybind.unit_command_boost = Comportament: Sobrevola +keybind.unit_command_load_units = Comportament: Carrega unitats +keybind.unit_command_load_blocks = Comportament: Carrega blocs +keybind.unit_command_unload_payload = Comportament: Descarrega keybind.rebuild_select.name = Reconstrueix la regió keybind.schematic_select.name = Selecciona una regió keybind.schematic_menu.name = Menú de plànols @@ -1239,7 +1239,7 @@ mode.pvp.description = Lluiteu contra altres jugadors localment.\n[gray]Cal que mode.attack.name = Atac mode.attack.description = Destruïu la base enemiga. \n[gray]Cal que al mapa hi hagi un nucli vermell. mode.custom = Regles personalitzades -rules.invaliddata = Invalid clipboard data. +rules.invaliddata = Dades del porta-retalls no vàlides. rules.hidebannedblocks = Amaga els blocs no permesos rules.infiniteresources = Recursos infinits @@ -2274,10 +2274,10 @@ lst.cutscene = Manipula la càmera del jugador. lst.setflag = Estableix un senyal global que es podrà llegir en tots els processadors. lst.getflag = Obtén un senyal global. lst.setprop = Estableix una propietat d’una unitat o estructura. -lst.effect = Create a particle effect. -lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most. -lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world. -lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction. +lst.effect = Crea un efecte de particula. +lst.sync = Sincronitza una variable a través de la xarxa.\nS’invoca com a molt 10 vegades per segon. +lst.makemarker = Crea una marca lògica al món.\nS’ha de donar un ID per a identificar-la.\nEs poden establir fins a 20.000 marcadors per món. +lst.setmarker = Estableix una propietat per a la marca.\nL’ID que es faci servir ha de ser el mateix que el de la instrucció de crear la marca. logic.nounitbuild = [red]Aquí no es permet construir blocs de tipus lògic. From d9c2e9a6b1e1b50440a96552c676217645897fc4 Mon Sep 17 00:00:00 2001 From: NazrinNya <137837419+NazrinNya@users.noreply.github.com> Date: Fri, 13 Oct 2023 21:58:59 +0300 Subject: [PATCH 2/7] Update servers_v7.json (#9165) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index b9b87c8b62..26a9e28ce5 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -210,7 +210,7 @@ }, { "name": "Cyandustry", - "address": ["91.218.66.162:8000","91.218.66.162:7000", "91.218.66.162:7500", "91.218.66.162:7600"] + "address": ["136.243.14.186:7000","136.243.14.186:7001", "136.243.14.186:7002", "136.243.14.186:7003", "136.243.14.186:7004", "136.243.14.186:7005", "136.243.14.186:7006"] }, { "name": "Four Family", From 002f3225633e94cfba86a6a0b14377547566084e Mon Sep 17 00:00:00 2001 From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com> Date: Fri, 13 Oct 2023 21:14:55 -0400 Subject: [PATCH 3/7] Add Atomic to the server list (#9155) * Add Atomic to the server list * Add second port * Remove unused port 6567 Was hoping to use it soon:tm: but oh well... --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 26a9e28ce5..fc76a8ba41 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -255,5 +255,9 @@ { "name": "MineCore", "address": ["194.247.42.11:27792"] + }, + { + "name": "Atomic", + "address": ["atomic-lab.ddns.net:30315"] } ] From a6d0a17bd9bf1ddce7bca5939a223fab533f0dac Mon Sep 17 00:00:00 2001 From: WayZer Date: Sat, 14 Oct 2023 21:09:59 +0800 Subject: [PATCH 4/7] PR: world-switch (#9167) --- .../sprites/blocks/logic/world-switch-on.png | Bin 0 -> 164 bytes .../sprites/blocks/logic/world-switch.png | Bin 0 -> 389 bytes core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 9 +++++++- .../world/blocks/logic/SwitchBlock.java | 21 ++++++++++++++++++ 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/blocks/logic/world-switch-on.png create mode 100644 core/assets-raw/sprites/blocks/logic/world-switch.png diff --git a/core/assets-raw/sprites/blocks/logic/world-switch-on.png b/core/assets-raw/sprites/blocks/logic/world-switch-on.png new file mode 100644 index 0000000000000000000000000000000000000000..54f03c820cb716941b2f38c66f42d18a3edf68c5 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk z0|P^tr;B4qMC;ot2YDF;1Y82YEOrZA++;Di;|+(>&-Xdy&lsLFF!WcJZkQIb+ttu} z_mYK%HOpHn6U5d{GmwpI)mCj~hr;D6qm>(G->)?Bub7tp5hNy_X^EqN)YWn1! z8yI9iO5yOmFiV>U1Tuf_j7YusR#{8@fQ~w=!0Pq|%qKR^5!qX@S<$W`?#QI*lw=Es zr$4eL>9%(!7PD0CY@FBTp~v|#RIf!#E~i0-T_BlpWuL@{T?tnhRV*83tZ~aKQ?X?E z5b59-*$~JlGjWTHaAf~gr6g{pGv5x1{^3&)3%C{0%Geb6;JLiVwud{iTqemltW)mT zIH$3(v9a~WB<^P%v!5UTxN3K@WLLP{UArEE9c6F%0{N8K6SC(d^)f|SFomC%NS9i$ mO! entity.enabled = b); } + public boolean accessible(){ + return !privileged || state.rules.editor; + } + + @Override + public boolean canBreak(Tile tile){ + return accessible(); + } + public class SwitchBuild extends Building{ + @Override + public void damage(float damage){ + if(privileged) return; + super.damage(damage); + } + + @Override + public boolean collide(Bullet other){ + return !privileged; + } @Override public boolean configTapped(){ From fbdfef625a935b15d55637ae0461c9794b68ef89 Mon Sep 17 00:00:00 2001 From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com> Date: Sat, 14 Oct 2023 22:12:47 -0400 Subject: [PATCH 5/7] Add Atomic Attack server (#9170) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index fc76a8ba41..4053ab3a1c 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -258,6 +258,6 @@ }, { "name": "Atomic", - "address": ["atomic-lab.ddns.net:30315"] + "address": ["129.146.33.189:25709", "atomic-lab.ddns.net:30315"] } ] From ef1413beab93bc01c068def61bb652f6d9188606 Mon Sep 17 00:00:00 2001 From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com> Date: Sat, 14 Oct 2023 22:18:13 -0400 Subject: [PATCH 6/7] Add "loadautosave" server command. (#9169) * Add "loadautosave" server command. A command that loads the last auto-save. This command can be placed inside `config startcommands` to automatically load the last save when the server starts. * autosaves config is actually autosave. use first() not get(0) * Get most recent autosave w/o sorting * Remove left over debug oops.... --- .../src/mindustry/server/ServerControl.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index a26507d857..e6ab76fb7a 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -910,6 +910,37 @@ public class ServerControl implements ApplicationListener{ } }); + handler.register("loadautosave", "Loads the last auto-save.", arg -> { + if(state.isGame()){ + err("Already hosting. Type 'stop' to stop hosting first."); + return; + } + + Fi newestSave = saveDirectory.findAll(f -> f.name().startsWith("auto_")).min(Fi::lastModified); + + if(newestSave == null){ + err("No auto-saves found! Type `config autosave true` to enable auto-saves."); + return; + } + + if(!SaveIO.isSaveValid(newestSave)){ + err("No (valid) save data found for slot."); + return; + } + + Core.app.post(() -> { + try{ + SaveIO.load(newestSave); + state.rules.sector = null; + info("Save loaded."); + state.set(State.playing); + netServer.openServer(); + }catch(Throwable t){ + err("Failed to load save. Outdated or corrupt file."); + } + }); + }); + handler.register("load", "", "Load a save from a slot.", arg -> { if(state.isGame()){ err("Already hosting. Type 'stop' to stop hosting first."); From da8ebad0c576c9a30d6af1b1819a26d9009f2053 Mon Sep 17 00:00:00 2001 From: Jason <131086642+JasonP01@users.noreply.github.com> Date: Sun, 15 Oct 2023 05:12:07 +0200 Subject: [PATCH 7/7] Update servers_v7.json (#9171) Added xpdustry events to partnered servers --- servers_v7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 4053ab3a1c..0738a81b52 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -89,7 +89,7 @@ }, { "name": "Chaotic Neutral", - "address": ["c-n.ddns.net:7012", "c-n.ddns.net:7013", "c-n.ddns.net:7014", "c-n.ddns.net:7015", "c-n.ddns.net:7016", "c-n.ddns.net:7017", "37.187.73.180:7021"] + "address": ["c-n.ddns.net:7012", "c-n.ddns.net:7013", "c-n.ddns.net:7014", "c-n.ddns.net:7015", "c-n.ddns.net:7016", "c-n.ddns.net:7017", "c-n.ddns.net:7003", "37.187.73.180:7021"] }, { "name": "io", @@ -121,7 +121,7 @@ }, { "name": "Fish", - "address": ["162.248.101.95", "162.248.100.98", "162.248.100.133", "162.248.102.204"] + "address": ["162.248.101.95", "162.248.100.98", "162.248.100.133", "162.248.102.204", "c-n.ddns.net:7003"] }, { "name": "The Devil",