From e97dc7a9603bf62caa7ba50fec137c4145a2e1f5 Mon Sep 17 00:00:00 2001 From: PolarStar <107398572+PoIarStar@users.noreply.github.com> Date: Sun, 24 Mar 2024 22:03:08 +0300 Subject: [PATCH 1/7] Update servers_v7.json (#9671) Merging servers --- servers_v7.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index d95da17b9b..ad5b28bdfb 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -28,13 +28,9 @@ "name": "Crux's Revelations", "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"] }, - { - "name": "Chilldustry", - "address": ["trelesco.xyz"] - }, { "name": "CMS Empire", - "address": ["94.250.250.252","95.84.198.97"] + "address": ["trelesco.xyz","94.250.250.252","95.84.198.97"] }, { "name": "ShardDustry Eventos", From 4cacb79ccd2e6aaee7fc726c54b5af68327ea3e1 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 25 Mar 2024 10:31:03 -0700 Subject: [PATCH 2/7] Auto-add produce to liquids (#9666) --- core/src/mindustry/mod/ContentParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 093f9fd98f..40da31c7d1 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -1102,8 +1102,8 @@ public class ContentParser{ } //all items have a produce requirement unless already specified - if(object instanceof Item i && !node.objectives.contains(o -> o instanceof Produce p && p.content == i)){ - node.objectives.add(new Produce(i)); + if((unlock instanceof Item || unlock instanceof Liquid) && !node.objectives.contains(o -> o instanceof Produce p && p.content == unlock)){ + node.objectives.add(new Produce(unlock)); } //remove old node from parent From 88d37763daa3fbc37258dd93dd764f77133f1566 Mon Sep 17 00:00:00 2001 From: PolarStar <107398572+PoIarStar@users.noreply.github.com> Date: Mon, 25 Mar 2024 21:11:30 +0300 Subject: [PATCH 3/7] Update servers_v7.json (#9674) deleted outdated addresses --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index ad5b28bdfb..f003996b48 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -30,7 +30,7 @@ }, { "name": "CMS Empire", - "address": ["trelesco.xyz","94.250.250.252","95.84.198.97"] + "address": ["trelesco.xyz"] }, { "name": "ShardDustry Eventos", From ce22552bca1b3db64c1ce0fbca17b640cc66fe96 Mon Sep 17 00:00:00 2001 From: GaviTSRA <61122293+GaviTSRA@users.noreply.github.com> Date: Mon, 25 Mar 2024 21:41:56 +0100 Subject: [PATCH 4/7] Add TSR Sandbox to v7 serverlist (#9672) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index f003996b48..3fdb7f9aa5 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,4 +1,8 @@ [ + { + "name": "TSR Network", + "address": ["de-prem-01.hosts.optikservers.com:35526"] + }, { "name": "Toast Mindustry", "address": ["192.3.139.5:6567", "192.3.139.5:6568", "192.3.139.5:6569", "104.168.64.154:6567", "104.168.64.154:6568", "104.168.64.154:6569"] From 9c3ff565082ba28be54b03b6986dc4a78e6dceff Mon Sep 17 00:00:00 2001 From: Hunggaming128 <160811008+Hunggaming128@users.noreply.github.com> Date: Tue, 26 Mar 2024 03:42:05 +0700 Subject: [PATCH 5/7] Update servers_v7.json (#9669) --- servers_v7.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 3fdb7f9aa5..7ef103cac1 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -293,12 +293,12 @@ "name": "MineCore", "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] }, - { - "name": "Sever.VN", - "address": ["192.168.1.2:6567"] - }, { "name": "NPTS", "address": ["81.94.159.242"] + }, + { + "name": "Skywar.VN", + "address": ["nur-de-01.blued.host:25736"] } ] From 631e8a4fa47c5a98f8bc470a38f7b00fddbefcdd Mon Sep 17 00:00:00 2001 From: Jason <131086642+JasonP01@users.noreply.github.com> Date: Mon, 25 Mar 2024 22:42:14 +0200 Subject: [PATCH 6/7] fix poly (#9662) Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com> --- core/src/mindustry/content/UnitTypes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 089f5d4e39..c9200be5e1 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1318,6 +1318,7 @@ public class UnitTypes{ healPercent = 5.5f; collidesTeam = true; + reflectable = false; backColor = Pal.heal; trailColor = Pal.heal; }}; From e595627895e2b332d44aeae78ae9ac493cc49021 Mon Sep 17 00:00:00 2001 From: Elixias <61173114+LixieWulf@users.noreply.github.com> Date: Mon, 25 Mar 2024 17:20:26 -0600 Subject: [PATCH 7/7] . (#9676) --- .../mindustry/entities/bullet/ContinuousFlameBulletType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java b/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java index 4d67083cec..30dd5011fb 100644 --- a/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java +++ b/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java @@ -49,6 +49,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{ lifetime = 16f; hitColor = colors[1].cpy().a(1f); lightColor = hitColor; + lightOpacity = 0.7f; laserAbsorb = false; ammoMultiplier = 1f; pierceArmor = true; @@ -87,7 +88,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{ } Tmp.v1.trns(b.rotation(), realLength * 1.1f); - Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, 0.7f); + Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, lightOpacity); Draw.reset(); }