From cd09c375d2fff52358127fa2adade8292a7a6fa8 Mon Sep 17 00:00:00 2001 From: router Date: Thu, 12 May 2022 00:07:57 +0300 Subject: [PATCH 1/4] Update servers_be.json (#6817) among us --- servers_be.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers_be.json b/servers_be.json index 9245f93cec..52cde762dd 100644 --- a/servers_be.json +++ b/servers_be.json @@ -5,6 +5,9 @@ { "address": "0.baseduser.eu.org:7777" }, + { + "address": "0.baseduser.eu.org:42001" + }, { "address": "v7.mindurka.tk:9999" }, From 69b730ba789e564556d4c6c29481438590934e5b Mon Sep 17 00:00:00 2001 From: Somka000 <51973243+Somka000@users.noreply.github.com> Date: Thu, 12 May 2022 00:43:38 +0200 Subject: [PATCH 2/4] Update .pl in server list (#6832) * be * Remove .pl from 7.0 list --- servers_be.json | 6 ++++++ servers_v7.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/servers_be.json b/servers_be.json index 52cde762dd..9f13a22461 100644 --- a/servers_be.json +++ b/servers_be.json @@ -2,6 +2,12 @@ { "address": "be.mindustry.nydus.app:6567" }, + { + "address": "130.61.226.9" + }, + { + "address": "130.61.226.9:7777" + }, { "address": "0.baseduser.eu.org:7777" }, diff --git a/servers_v7.json b/servers_v7.json index 16c62e91f9..152b5f370d 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,7 +1,7 @@ [ { "name": "distributorium", - "address": ["130.61.226.9", "0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000"] + "address": ["0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000"] }, { "name": "C.A.M.S.", From d4681f2c94b3ed083136da1530505656846095d8 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Wed, 11 May 2022 19:27:47 -0400 Subject: [PATCH 3/4] No. (#6833) --- core/src/mindustry/input/InputHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 86a834d2e3..97521737e0 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -287,7 +287,6 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ throw new ValidateException(player, "Player cannot transfer an item."); } - //deposit for every controlling unit var unit = player.unit(); Item item = unit.item(); int accepted = build.acceptStack(item, unit.stack.amount, unit); From 19d5170137a2067ec9edf7d99aedb34b42d39e87 Mon Sep 17 00:00:00 2001 From: Rex <77251557+Rex-Hm@users.noreply.github.com> Date: Wed, 11 May 2022 21:13:47 -0300 Subject: [PATCH 4/4] Update contributors (#6836) --- core/assets/contributors | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index 14b0865cc2..deb7ac7335 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -41,6 +41,7 @@ Jan Polák JrTRinny JustYanns BasedUser +RexHm BLucky-gh DinoWattz Jae @@ -136,4 +137,4 @@ Evolveye Jerzy Paciorkiewicz YozoZChomutova Qendolin -Goobrr \ No newline at end of file +Goobrr