From 35923329a1324e7b8ecf23e8c06c63a26edb4f72 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Thu, 18 Aug 2022 20:07:13 -0700
Subject: [PATCH 1/2] ParticleEffect line cap option (#7392)

---
 core/src/mindustry/entities/effect/ParticleEffect.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/effect/ParticleEffect.java b/core/src/mindustry/entities/effect/ParticleEffect.java
index 39213eef35..0913cecb62 100644
--- a/core/src/mindustry/entities/effect/ParticleEffect.java
+++ b/core/src/mindustry/entities/effect/ParticleEffect.java
@@ -44,6 +44,7 @@ public class ParticleEffect extends Effect{
     //line only
     public boolean line;
     public float strokeFrom = 2f, strokeTo = 0f, lenFrom = 4f, lenTo = 2f;
+    public boolean cap = true;
 
     private @Nullable TextureRegion tex;
 
@@ -77,7 +78,7 @@ public class ParticleEffect extends Effect{
                 rv.trns(realRotation + rand.range(cone), !randLength ? l : rand.random(l));
                 float x = rv.x, y = rv.y;
 
-                Lines.lineAngle(ox + x, oy + y, Mathf.angle(x, y), len);
+                Lines.lineAngle(ox + x, oy + y, Mathf.angle(x, y), len, cap);
                 Drawf.light(ox + x, oy + y, len * lightScl, lightColor, lightOpacity * Draw.getColor().a);
             }
         }else{

From bec3de9d675555a9ce83ee56b6691b0d958b2f0c Mon Sep 17 00:00:00 2001
From: Volas171 <volas@mindustry.me>
Date: Fri, 19 Aug 2022 15:51:58 -0500
Subject: [PATCH 2/2] Omega Hub ServerList Change (#7398)

* Update servers_v6.json

* Update servers_v7.json
---
 servers_v6.json | 2 +-
 servers_v7.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers_v6.json b/servers_v6.json
index a804bb1258..98c2289c94 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "Omega Hub",
-    "address": ["n1.yeet.ml", "n1.yeet.ml:6568","n1.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571", "n1.yeet.ml:6609"]
+    "address": ["n5.yeet.ml", "n1.yeet.ml:6568","n5.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571", "n1.yeet.ml:6609"]
   },
   {
     "name": "RCM",
diff --git a/servers_v7.json b/servers_v7.json
index bfbf3953f1..ca09f1127b 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -22,7 +22,7 @@
   },
   {
     "name": "Omega Hub",
-    "address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n1.yeet.ml:6605", "n1.yeet.ml:6608","n1.yeet.ml:6599"]
+    "address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n5.yeet.ml:6605", "n5.yeet.ml:6606", "n1.yeet.ml:6608","n1.yeet.ml:6599"]
   },
   {
     "name": "KMWStudios",