From df3901fda2b427b219af68d6f6a9cebea1dd6e8d Mon Sep 17 00:00:00 2001 From: Yuri Polyakov <86189625+Kowkodivka@users.noreply.github.com> Date: Sat, 13 Nov 2021 11:29:15 +0700 Subject: [PATCH 1/3] why (#6330) The server is on version v6 is in the list of servers v7. --- servers_v7.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index c0827a6205..7f5b9fef21 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -23,10 +23,6 @@ "name": "DarkDustry", "address": ["darkdustry.ml", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] }, - { - "name": "SkaarjDustry", - "address": ["skaarjproject.duckdns.org"] - }, { "name": "Chaotic Neutral", "address": ["c-n.ddns.net:5555", "c-n.ddns.net:6666"] From a786e93329520e9870cba5cf5c1fff746f6766fc Mon Sep 17 00:00:00 2001 From: Rex <77251557+Rex-Hm@users.noreply.github.com> Date: Sat, 13 Nov 2021 20:55:28 -0300 Subject: [PATCH 2/3] Update servers_v6.json (#6332) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 744db8721f..e2d74ea16b 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -105,7 +105,7 @@ }, { "name": "Mindustry EspaƱol", - "address": ["n2.mindustry.me:4019", "mindustry.me:2034", "mindustry.me:2035"] + "address": ["panel.mindustry.me:2011", "mindustry.me:2034", "mindustry.me:2035"] }, { "name": "CreateDustry", From f586fd285ca139d8c0b8d657c9718270574c6097 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 15 Nov 2021 08:24:39 -0500 Subject: [PATCH 3/3] Fixed #6341 --- core/src/mindustry/input/DesktopInput.java | 1 + gradle.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index 7865462726..6508e05476 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -616,6 +616,7 @@ public class DesktopInput extends InputHandler{ super.updateState(); if(state.isMenu()){ + lastSchematic = null; droppingItem = false; mode = none; block = null; diff --git a/gradle.properties b/gradle.properties index 5f9a9e6662..47efdec8d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=5e7ddf887d6632c9ca7bd3fa1ef9fef748a3a84e +archash=430f9146f3c9c34db1f9ad9a8784e71c322246f2