From 38a3f1839e729b34ee7f5ea073c49b68363b4b47 Mon Sep 17 00:00:00 2001
From: OSP <76648940+osp54@users.noreply.github.com>
Date: Tue, 29 Jun 2021 01:58:39 +0300
Subject: [PATCH 1/3] Change ip XCore, and add new server (#5502)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 9a156872e3..83dc94a4b0 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -36,7 +36,7 @@
   },
   {
     "name": "XCore",
-    "address": "178.170.47.34:28110"
+    "address": ["35.202.253.94" , "35.202.253.94:2000"]
   },
   {
     "name": "Obvilion Network",

From cececa190a63c6e9283dafcf0f3e98326f12da3c Mon Sep 17 00:00:00 2001
From: Minxyzgo <71958008+Minxyzgo@users.noreply.github.com>
Date: Tue, 29 Jun 2021 20:54:10 +0800
Subject: [PATCH 2/3] Update WaterMoveComp.java (#5504)

---
 core/src/mindustry/entities/comp/WaterMoveComp.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/comp/WaterMoveComp.java b/core/src/mindustry/entities/comp/WaterMoveComp.java
index 220386e31d..36364b2168 100644
--- a/core/src/mindustry/entities/comp/WaterMoveComp.java
+++ b/core/src/mindustry/entities/comp/WaterMoveComp.java
@@ -19,7 +19,7 @@ import static mindustry.Vars.*;
 
 @Component
 abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
-    @Import float x, y, rotation;
+    @Import float x, y, rotation, speedMultiplier;
     @Import UnitType type;
 
     private transient Trail tleft = new Trail(1), tright = new Trail(1);
@@ -74,7 +74,7 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
     @Replace
     public float floorSpeedMultiplier(){
         Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();
-        return on.isDeep() ? 1.3f : 1f;
+        return (on.isDeep() ? 1.3f : 1f) * speedMultiplier;
     }
 
     public boolean onLiquid(){

From 5c803594fbd378be40d61a04a046d6f5161e6500 Mon Sep 17 00:00:00 2001
From: Arik <arikcheslog@gmail.com>
Date: Tue, 29 Jun 2021 06:03:56 -0700
Subject: [PATCH 3/3] Fix WaveGraph Lineup (#5503)

---
 core/src/mindustry/editor/WaveGraph.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java
index cc36f22620..4f9562836d 100644
--- a/core/src/mindustry/editor/WaveGraph.java
+++ b/core/src/mindustry/editor/WaveGraph.java
@@ -53,7 +53,7 @@ public class WaveGraph extends Table{
 
                     for(int i = 0; i < values.length; i++){
                         int val = values[i][type.id];
-                        float cx = graphX + i*spacing, cy = 2f + graphY + val * (graphH - 4f) / max;
+                        float cx = graphX + i*spacing, cy = graphY + val * graphH / max;
                         Lines.linePoint(cx, cy);
                     }
 
@@ -69,7 +69,7 @@ public class WaveGraph extends Table{
                         sum += values[i][type.id];
                     }
 
-                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxTotal;
+                    float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxTotal;
                     Lines.linePoint(cx, cy);
                 }
 
@@ -84,7 +84,7 @@ public class WaveGraph extends Table{
                         sum += (type.health) * values[i][type.id];
                     }
 
-                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxHealth;
+                    float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxHealth;
                     Lines.linePoint(cx, cy);
                 }
 
@@ -92,29 +92,29 @@ public class WaveGraph extends Table{
             }
 
             //how many numbers can fit here
-            float totalMarks = (height - offsetY - getMarginBottom() *2f - 1f) / (lay.height * 2);
+            float totalMarks = (graphH - getMarginBottom() *2f) / (lay.height * 2);
 
             int markSpace = Math.max(1, Mathf.ceil(max / totalMarks));
 
             Draw.color(Color.lightGray);
             for(int i = 0; i < max; i += markSpace){
-                float cy = 2f + y + i * (height - 4f) / max + offsetY, cx = x + offsetX;
+                float cy = graphY + i * graphH / max, cx = graphX;
                 //Lines.line(cx, cy, cx + len, cy);
 
                 lay.setText(font, "" + i);
 
-                font.draw("" + i, cx, cy + lay.height/2f - Scl.scl(3f), Align.right);
+                font.draw("" + i, cx, cy + lay.height/2f, Align.right);
             }
 
             float len = Scl.scl(4f);
             font.setColor(Color.lightGray);
 
             for(int i = 0; i < values.length; i++){
-                float cy = y + fh, cx = x + graphW / (values.length - 1) * i + offsetX;
+                float cy = y + fh, cx = graphX + graphW / (values.length - 1) * i;
 
                 Lines.line(cx, cy, cx, cy + len);
                 if(i == values.length/2){
-                    font.draw("" + (i + from + 1), cx, cy - 2f, Align.center);
+                    font.draw("" + (i + from + 1), cx, cy - Scl.scl(2f), Align.center);
                 }
             }
             font.setColor(Color.white);