From c818611bb444fd041519f343141fa3594aa31c7f Mon Sep 17 00:00:00 2001 From: GTMZ <113624426+GTMZOMEAGEAmazon@users.noreply.github.com> Date: Sat, 24 Sep 2022 06:55:38 +0700 Subject: [PATCH 1/6] add one ip address! (#7611) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index b58bd757ca..09ac962d56 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -129,6 +129,6 @@ }, { "name": "LightDustry", - "address": ["own-formerly.craft.playit.gg:26618", "lightdusy.ddns.net:6567", "lightdusy.ddns.net:6568"] + "address": ["own-formerly.craft.playit.gg:26618", "lightdusy.ddns.net:6567", "lightdusy.ddns.net:6568", "209.25.142.180:39065"] } ] From fd0d4fb09720b4fdf32eddd9ac872b6702417c62 Mon Sep 17 00:00:00 2001 From: null <89076920+stacktrace-error@users.noreply.github.com> Date: Sat, 24 Sep 2022 13:49:54 +0200 Subject: [PATCH 2/6] why is this hardcoded anyway (#7617) --- core/src/mindustry/world/draw/DrawHeatRegion.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/draw/DrawHeatRegion.java b/core/src/mindustry/world/draw/DrawHeatRegion.java index 8b2ccd129d..7c42f9c228 100644 --- a/core/src/mindustry/world/draw/DrawHeatRegion.java +++ b/core/src/mindustry/world/draw/DrawHeatRegion.java @@ -12,10 +12,15 @@ import mindustry.world.blocks.production.HeatCrafter.*; public class DrawHeatRegion extends DrawBlock{ public Color color = new Color(1f, 0.22f, 0.22f, 0.8f); public float pulse = 0.3f, pulseScl = 10f; + public float layer = Layer.blockAdditive; public TextureRegion heat; public String suffix = "-glow"; + public DrawHeatRegion(float layer){ + this.layer = layer; + } + public DrawHeatRegion(String suffix){ this.suffix = suffix; } @@ -27,13 +32,16 @@ public class DrawHeatRegion extends DrawBlock{ public void draw(Building build){ Draw.z(Layer.blockAdditive); if(build instanceof HeatCrafterBuild hc && hc.heat > 0){ + + float z = Draw.z(); + if(layer > 0) Draw.z(layer); Draw.blend(Blending.additive); Draw.color(color, Mathf.clamp(hc.heat / hc.heatRequirement()) * (color.a * (1f - pulse + Mathf.absin(pulseScl, pulse)))); Draw.rect(heat, build.x, build.y); Draw.blend(); Draw.color(); + Draw.z(z); } - Draw.z(Layer.block); } @Override From c456970d4db9d79e96d6fd630ff02f3a1e664381 Mon Sep 17 00:00:00 2001 From: Joel Date: Sat, 24 Sep 2022 11:50:21 +0000 Subject: [PATCH 3/6] fix json syntax errors and omnidustry hub being in servers_v6.json when it is v7 (#7615) * fix: json syntax errors * fix: omnidustry hub is v7, not v6 --- servers_v6.json | 7 +------ servers_v7.json | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index adb9c6c99d..018f2455a1 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -131,17 +131,12 @@ "name": "Shard", "address": ["59.12.120.171"] }, - { - "name": "OMNIDUSTRY", - "address": ["109.94.209.233"] - } { "name": "New Campaign Like", "address": ["n5.yeet.ml:6568"] }, { - "name": "AlternightBR" + "name": "AlternightBR", "address": ["mindustrypt.ga:8300"] } - ] diff --git a/servers_v7.json b/servers_v7.json index 09ac962d56..8185d4bbf9 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -109,7 +109,7 @@ }, { "name": "OMNIDUSTRY", - "address": ["109.94.209.233:6568","109.94.209.233:6569","109.94.209.233:6570","109.94.209.233:6571","109.94.209.233:6572","109.94.209.233:6573","109.94.209.233:6574"] + "address": ["109.94.209.233","109.94.209.233:6568","109.94.209.233:6569","109.94.209.233:6570","109.94.209.233:6571","109.94.209.233:6572","109.94.209.233:6573","109.94.209.233:6574"] }, { "name": "The Devil", From a966fb08829e96ad51f1ffdc8a52bd9aba74af2f Mon Sep 17 00:00:00 2001 From: RTOmega <62565267+RebornTrack970@users.noreply.github.com> Date: Sat, 24 Sep 2022 16:38:34 +0300 Subject: [PATCH 4/6] OmegaHub dns change (#7618) * Update servers_v7.json * 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 018f2455a1..c462348361 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -13,7 +13,7 @@ }, { "name": "Omega Hub", - "address": ["n5.yeet.ml", "n1.yeet.ml:6568","n5.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571", "n1.yeet.ml:6609"] + "address": ["n1.mindustry.me:6614","n1.mindustry.me:6568","n1.mindustry.me:6612","n1.mindustry.me:6570","n1.mindustry.me:6609"] }, { "name": "EasyPlay", diff --git a/servers_v7.json b/servers_v7.json index 8185d4bbf9..5d1851104d 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -33,7 +33,7 @@ }, { "name": "Omega Hub", - "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", "n1.yeet.ml:6567"] + "address": ["n1.mindustry.me:6572","n1.mindustry.me:6573","n1.mindustry.me:6574","n1.mindustry.me:6604","n1.mindustry.me:6569","n1.mindustry.me:6611","n1.mindustry.me:6610","n1.mindustry.me:6599","n1.mindustry.me","n1.mindustry.me:6608"] }, { "name": "KMWStudios", From e1757b3539bade69dcd217431afabb41af13ec81 Mon Sep 17 00:00:00 2001 From: Brandons404 <43156510+Brandons404@users.noreply.github.com> Date: Sat, 24 Sep 2022 18:25:08 -0500 Subject: [PATCH 5/6] Update servers_v7.json (#7620) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 5d1851104d..3e81fbf6d8 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -101,7 +101,7 @@ }, { "name": "Fish", - "address": ["170.187.144.235"] + "address": ["170.187.144.235", "45.79.203.155"] }, { "name": "Harders", From a9334bcc659e75ea51875cabd4791c1413e76a9a Mon Sep 17 00:00:00 2001 From: Klomertza <114155629+Klomertza@users.noreply.github.com> Date: Sun, 25 Sep 2022 01:26:33 +0200 Subject: [PATCH 6/6] Update servers_v7.json (#7619) Added my Server --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 3e81fbf6d8..f25eb45e11 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -130,5 +130,9 @@ { "name": "LightDustry", "address": ["own-formerly.craft.playit.gg:26618", "lightdusy.ddns.net:6567", "lightdusy.ddns.net:6568", "209.25.142.180:39065"] + }, + { + "name": "Simply", + "address": ["178.203.202.107"] } ]