From d0845b481c9a34c4c3424e18b1adcea78fce86ef Mon Sep 17 00:00:00 2001 From: GlFolker <63218676+GlennFolker@users.noreply.github.com> Date: Wed, 14 Feb 2024 22:04:55 +0700 Subject: [PATCH 01/15] Update Sector.java (#9553) --- core/src/mindustry/type/Sector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index 921802e389..304a73452a 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -236,7 +236,7 @@ public class Sector{ /** Projects this sector onto a 4-corner square for use in map gen. * Allocates a new object. Do not call in the main loop. */ - private SectorRect makeRect(){ + protected SectorRect makeRect(){ Vec3[] corners = new Vec3[tile.corners.length]; for(int i = 0; i < corners.length; i++){ corners[i] = tile.corners[i].v.cpy().setLength(planet.radius); From c8d773382610a64187fb94cd55e2fc05b8ba6d8f Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 14 Feb 2024 10:37:48 -0500 Subject: [PATCH 02/15] Fixed #9552 --- core/src/mindustry/ui/dialogs/TraceDialog.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java index a541f48027..a758e22fb3 100644 --- a/core/src/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/mindustry/ui/dialogs/TraceDialog.java @@ -36,8 +36,6 @@ public class TraceDialog extends BaseDialog{ c.add(Core.bundle.format("trace.ip", info.ip)).row(); c.button(Icon.copySmall, style, () -> copy(info.uuid)).size(s).padRight(4f); c.add(Core.bundle.format("trace.id", info.uuid)).row(); - c.button(Icon.copySmall, style, () -> copy(player.locale)).size(s).padRight(4f); - c.add(Core.bundle.format("trace.language", player.locale)).row(); }).row(); table.add(Core.bundle.format("trace.modclient", info.modded)).row(); From 56d0b8744305a0717d0dfa883b39dee2a7586a1b Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 16 Feb 2024 09:50:18 -0500 Subject: [PATCH 03/15] Fixed #9562 --- core/src/mindustry/ai/UnitGroup.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/ai/UnitGroup.java b/core/src/mindustry/ai/UnitGroup.java index dbb55312f3..2721c07d55 100644 --- a/core/src/mindustry/ai/UnitGroup.java +++ b/core/src/mindustry/ai/UnitGroup.java @@ -26,6 +26,7 @@ public class UnitGroup{ if(lastSpeedUpdate == Vars.state.updateId) return; lastSpeedUpdate = Vars.state.updateId; + minSpeed = 999999f; for(Unit unit : units){ //don't factor in the floor speed multiplier From b27ed03842f106b23fa59a0aa201489737ab9724 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 16 Feb 2024 09:52:14 -0500 Subject: [PATCH 04/15] Fixed #9561 --- core/src/mindustry/world/Build.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index bbc38dbdd4..c1cfc9b5e7 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -50,6 +50,7 @@ public class Build{ if(tile.build != null){ prevBuild.add(tile.build); tile.build.onDeconstructed(unit); + tile.build.dead = true; } tile.setBlock(sub, team, rotation); From e6dd6cb44d8db96b5d405b3ae367a6175f6cf08c Mon Sep 17 00:00:00 2001 From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com> Date: Fri, 16 Feb 2024 21:52:31 +0700 Subject: [PATCH 05/15] Make privileged SwitchBlock(World Switch) can't pickup (#9557) --- core/src/mindustry/world/blocks/logic/SwitchBlock.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java index c3e579e456..6c166fd331 100644 --- a/core/src/mindustry/world/blocks/logic/SwitchBlock.java +++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java @@ -42,6 +42,11 @@ public class SwitchBlock extends Block{ if(privileged) return; super.damage(damage); } + + @Override + public boolean canPickup(){ + return !privileged; + } @Override public boolean collide(Bullet other){ From d79a306970598ae8d7fa29102d1ce2aa0653e5ed Mon Sep 17 00:00:00 2001 From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com> Date: Fri, 16 Feb 2024 21:52:41 +0700 Subject: [PATCH 06/15] Gammar & context fix (#9559) - `lglobal.@clientMobile = True is ...` => `lglobal.@clientMobile = True if ...` - `lenum.colori = Indexed position, ...` => `lenum.colori = Indexed color, ...` --- core/assets/bundles/bundle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f9cbaa5622..09f8119504 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -2372,7 +2372,7 @@ lglobal.@clientLocale = Locale of the client running the code. For example: en_U lglobal.@clientUnit = Unit of client running the code lglobal.@clientName = Player name of client running the code lglobal.@clientTeam = Team ID of client running the code -lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise +lglobal.@clientMobile = True if the client running the code is on mobile, false otherwise logic.nounitbuild = [red]Unit building logic is not allowed here. @@ -2532,4 +2532,4 @@ lenum.texturesize = Size of texture in tiles. Zero value scales marker width to lenum.autoscale = Whether to scale marker corresponding to player's zoom level. lenum.posi = Indexed position, used for line and quad markers with index zero being the first position. lenum.uvi = Texture's position ranging from zero to one, used for quad markers. -lenum.colori = Indexed position, used for line and quad markers with index zero being the first color. +lenum.colori = Indexed color, used for line and quad markers with index zero being the first color. From 54967429fea12a4523fba1820a2d66f8abf51435 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 17 Feb 2024 09:03:09 -0500 Subject: [PATCH 07/15] Fixed #9566 --- core/src/mindustry/logic/LExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index 3b67f5a958..d991a727eb 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -706,7 +706,7 @@ public class LExecutor{ int address = exec.numi(position); Building from = exec.building(target); - if(from instanceof MemoryBuild mem && (exec.privileged || from.team == exec.team) && address >= 0 && address < mem.memory.length){ + if(from instanceof MemoryBuild mem && (exec.privileged || (from.team == exec.team && !mem.block.privileged)) && address >= 0 && address < mem.memory.length){ mem.memory[address] = exec.num(value); } } From daf8398c5896bcabac23ffffbe26d1f3a5769a66 Mon Sep 17 00:00:00 2001 From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com> Date: Sat, 17 Feb 2024 21:04:17 +0700 Subject: [PATCH 08/15] Update servers_v7.json (#9567) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 7d89a80c1d..559c1d9e60 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -230,7 +230,7 @@ }, { "name": "ABCXYZ Community", - "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "5.9.8.124:28848"] + "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "5.9.8.124:28848", "srv1.godlike.club:28466"] }, { "name": "CroCraft Network", From 4e24b31c0de9985cecc31a97709422a9756ca0fc Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Sat, 17 Feb 2024 08:23:25 -0800 Subject: [PATCH 09/15] Allow gasses to be coolants (#9545) --- core/src/mindustry/type/Liquid.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java index a524970fcd..9032b4bf9b 100644 --- a/core/src/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -84,8 +84,6 @@ public class Liquid extends UnlockableContent implements Senseable{ super.init(); if(gas){ - //gases can't be coolants - coolant = false; //always "boils", it's a gas boilPoint = -1; //ensure no accidental global mutation From 2c3167e66848d25b14c5dd1d45047c2ebd741e79 Mon Sep 17 00:00:00 2001 From: GlFolker <63218676+GlennFolker@users.noreply.github.com> Date: Sun, 18 Feb 2024 03:48:33 +0700 Subject: [PATCH 10/15] Delegate more methods into Planet (#9568) --- .../graphics/g3d/PlanetRenderer.java | 12 +-------- core/src/mindustry/type/Planet.java | 22 ++++++++++++++++ .../mindustry/ui/dialogs/PlanetDialog.java | 26 +++++++++---------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 6b5c0b6676..3593f53957 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -203,17 +203,7 @@ public class PlanetRenderer implements Disposable{ } public void setPlane(Sector sector){ - float rotation = -sector.planet.getRotation(); - float length = 0.01f; - - projector.setPlane( - //origin on sector position - Tmp.v33.set(sector.tile.v).setLength((outlineRad + length) * sector.planet.radius).rotate(Vec3.Y, rotation).add(sector.planet.position), - //face up - sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v, sector.planet.radius).rotate(Vec3.Y, rotation).nor(), - //right vector - Tmp.v31.set(Tmp.v32).rotate(Vec3.Y, -rotation).add(sector.tile.v).rotate(sector.tile.v, 90).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor() - ); + sector.planet.setPlane(sector, projector); } public void fill(Sector sector, Color color, float offset){ diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 1aa63264e2..c25852881f 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -536,4 +536,26 @@ public class Planet extends UnlockableContent{ } batch.flush(Gl.lineStrip); } + + public Vec3 lookAt(Sector sector, Vec3 out){ + return out.set(sector.tile.v).rotate(Vec3.Y, -getRotation()); + } + + public Vec3 project(Sector sector, Camera3D cam, Vec3 out){ + return cam.project(out.set(sector.tile.v).setLength(outlineRad * radius).rotate(Vec3.Y, -getRotation()).add(position)); + } + + public void setPlane(Sector sector, PlaneBatch3D projector){ + float rotation = -getRotation(); + float length = 0.01f; + + projector.setPlane( + //origin on sector position + Tmp.v33.set(sector.tile.v).setLength((outlineRad + length) * radius).rotate(Vec3.Y, rotation).add(position), + //face up + sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v, radius).rotate(Vec3.Y, rotation).nor(), + //right vector + Tmp.v31.set(Tmp.v32).rotate(Vec3.Y, -rotation).add(sector.tile.v).rotate(sector.tile.v, 90).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor() + ); + } } diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 16d5d9e304..9a230d0fc6 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -167,7 +167,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ //show selection of Erekir/Serpulo campaign if the user has no bases, and hasn't selected yet (essentially a "have they played campaign before" check) shown(() -> { - if(!settings.getBool("campaignselect") && !content.planets().contains(p -> p.sectors.contains(s -> s.hasBase()))){ + if(!settings.getBool("campaignselect") && !content.planets().contains(p -> p.sectors.contains(Sector::hasBase))){ var diag = new BaseDialog("@campaign.select"); Planet[] selected = {null}; @@ -214,7 +214,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } //unlock defaults for older campaign saves (TODO move? where to?) - if(content.planets().contains(p -> p.sectors.contains(s -> s.hasBase())) || Blocks.scatter.unlocked() || Blocks.router.unlocked()){ + if(content.planets().contains(p -> p.sectors.contains(Sector::hasBase)) || Blocks.scatter.unlocked() || Blocks.router.unlocked()){ Seq.with(Blocks.junction, Blocks.mechanicalDrill, Blocks.conveyor, Blocks.duo, Items.copper, Items.lead).each(UnlockableContent::quietUnlock); } } @@ -372,11 +372,17 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ super.show(); } - void lookAt(Sector sector){ + public void lookAt(Sector sector){ if(sector.tile == Ptile.empty) return; + //TODO should this even set `state.planet`? the other lookAt() doesn't, so... state.planet = sector.planet; - state.camPos.set(Tmp.v33.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation())); + sector.planet.lookAt(sector, state.camPos); + } + + public void lookAt(Sector sector, float alpha){ + float len = state.camPos.len(); + state.camPos.slerp(sector.planet.lookAt(sector, Tmp.v33).setLength(len), alpha); } boolean canSelect(Sector sector){ @@ -648,10 +654,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } }).visible(() -> mode != select), - new Table(c -> { - expandTable = c; - })).grow(); - + new Table(c -> expandTable = c)).grow(); rebuildExpand(); } @@ -770,11 +773,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } } - public void lookAt(Sector sector, float alpha){ - float len = state.camPos.len(); - state.camPos.slerp(Tmp.v31.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()).setLength(len), alpha); - } - @Override public void act(float delta){ super.act(delta); @@ -801,7 +799,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ hoverLabel.touchable = Touchable.disabled; hoverLabel.color.a = state.uiAlpha; - Vec3 pos = planets.cam.project(Tmp.v31.set(hovered.tile.v).setLength(PlanetRenderer.outlineRad * state.planet.radius).rotate(Vec3.Y, -state.planet.getRotation()).add(state.planet.position)); + Vec3 pos = hovered.planet.project(hovered, planets.cam, Tmp.v31); hoverLabel.setPosition(pos.x - Core.scene.marginLeft, pos.y - Core.scene.marginBottom, Align.center); hoverLabel.getText().setLength(0); From ac4d57013df9651c53a6a038d66841482738cb46 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 19 Feb 2024 10:05:58 -0500 Subject: [PATCH 11/15] Fixed #9572 --- core/src/mindustry/graphics/MinimapRenderer.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index cd0362ff62..78d57bebea 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -148,17 +148,20 @@ public class MinimapRenderer{ Tmp.m2.set(Draw.trans()); + float scaleFactor; var trans = Tmp.m1.idt(); trans.translate(lastX, lastY); if(!worldSpace){ - trans.scl(Tmp.v1.set(lastW / rect.width, lastH / rect.height)); + trans.scl(Tmp.v1.set(scaleFactor = lastW / rect.width, lastH / rect.height)); trans.translate(-rect.x, -rect.y); }else{ - trans.scl(Tmp.v1.set(lastW / world.unitWidth(), lastH / world.unitHeight())); + trans.scl(Tmp.v1.set(scaleFactor = lastW / world.unitWidth(), lastH / world.unitHeight())); } trans.translate(tilesize / 2f, tilesize / 2f); Draw.trans(trans); + scaleFactor = 1f / scaleFactor; + for(Unit unit : units){ if(unit.inFogTo(player.team()) || !unit.type.drawMinimap) continue; @@ -198,7 +201,7 @@ public class MinimapRenderer{ dynamicTex.setFilter(TextureFilter.nearest); Tmp.tr1.set(dynamicTex); - Tmp.tr1.set(0f, 0f, 1f, 1f); + Tmp.tr1.set(0f, 1f, 1f, 0f); float wf = world.width() * tilesize; float hf = world.height() * tilesize; @@ -226,7 +229,7 @@ public class MinimapRenderer{ if(!mobile){ //draw bounds for camera - not drawn on mobile because you can't shift it by tapping anyway Rect r = Core.camera.bounds(Tmp.r1); - Lines.stroke(Scl.scl(3f)); + Lines.stroke(Scl.scl(3f) * scaleFactor); Draw.color(Pal.accent); Lines.rect(r.x, r.y, r.width, r.height); Draw.reset(); From eb42d91c5df720f6193a53bedee23948db9e7df7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 19 Feb 2024 10:20:26 -0500 Subject: [PATCH 12/15] Fixed #9573 --- .../stack-conveyors/surge-conveyor-edge-glow.png | Bin 0 -> 510 bytes .../world/blocks/distribution/StackConveyor.java | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png new file mode 100644 index 0000000000000000000000000000000000000000..379eb103947dfe00331072c9cd219f014c5e8359 GIT binary patch literal 510 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VBF#9 z;usRq`gYoDze5fJZs(cYSWPmR)Q4v9T%iDA3 zUf$Vu!Atvp?45mVX<|7sDfvNjiofMDq+Mf7>SgR&aBkz}yzJ^PWx&nm8P?LhOqvs>q#*k&QZAelbp=+)&pTf^

h}88f~qku;V4_kI0it`qNTCWI*T{qnr#rM-3!qshCI7SfUb SgBchY7(8A5T-G@yGywpIVcY)z literal 0 HcmV?d00001 diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index 264db024d8..e107b08a67 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -29,6 +29,7 @@ public class StackConveyor extends Block implements Autotiler{ public @Load("@-stack") TextureRegion stackRegion; /** requires power to work properly */ public @Load(value = "@-glow") TextureRegion glowRegion; + public @Load(value = "@-edge-glow", fallback = "@-glow") TextureRegion edgeGlowRegion; public float glowAlpha = 1f; public Color glowColor = Pal.redLight; @@ -154,7 +155,7 @@ public class StackConveyor extends Block implements Autotiler{ Draw.z(Layer.blockAdditive); Draw.color(glowColor, glowAlpha * power.status); Draw.blend(Blending.additive); - Draw.rect(glowRegion, x, y, rotation * 90); + Draw.rect(state == stateLoad ? edgeGlowRegion : glowRegion, x, y, rotation * 90); Draw.blend(); Draw.color(); Draw.z(Layer.block - 0.1f); From f50cfdf57b87a221e1c87806c6652c78de65265d Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 20 Feb 2024 10:11:24 -0500 Subject: [PATCH 13/15] Use --rerun for tests --- .github/workflows/pr.yml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5bb8637f56..eb2dcff192 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v2 - name: Run unit tests - run: ./gradlew clean cleanTest test --stacktrace + run: ./gradlew tests:test --stacktrace --rerun - name: Run unit tests and build JAR run: ./gradlew desktop:dist - name: Upload desktop JAR for testing diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee7..3994438e22 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 82222c87074ae8779aaa6f2605280f0aaaeec019 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 20 Feb 2024 10:11:55 -0500 Subject: [PATCH 14/15] Use --rerun for tests (for push too) --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d1194129d5..6d4dbbea84 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -57,4 +57,4 @@ jobs: git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack cd ../Mindustry - name: Run unit tests - run: ./gradlew clean cleanTest test --stacktrace + run: ./gradlew tests:test --rerun --stacktrace From 63b4d75c2662954cb1e03c2181fb27fbf78d2921 Mon Sep 17 00:00:00 2001 From: Gamer-art9044 <131509007+Gamer-art9044@users.noreply.github.com> Date: Tue, 20 Feb 2024 23:59:08 +0400 Subject: [PATCH 15/15] Update servers_v7.json (#9576) update. Adddin Crimson star --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 559c1d9e60..50306e0c62 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,6 +3,10 @@ "name": "STP", "address": ["23.88.73.88:25617"] }, + { + "name": "Crimson Star", + "address": ["185.103.101.121:25528"] + }, { "name" : "LesGarsCools", "address": ["est1.be"]