From 881eca636db0c4627c405ef1b1b79ab6449dabeb Mon Sep 17 00:00:00 2001 From: MWestfall Date: Mon, 27 Jan 2020 12:55:18 -0500 Subject: [PATCH 1/2] Update servers.json (#1457) --- servers.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/servers.json b/servers.json index 81ea4bf021..8812eee20f 100644 --- a/servers.json +++ b/servers.json @@ -1,5 +1,11 @@ [ { "address": "mindustry.us.to" + }, + { + "address": "mindustry.ecansol.com:6597" + }, + { + "address": "mindustry.ecansol.com:6499" } ] From 5ad0193a866fbabcb97934518d45cc08bd9b157d Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 27 Jan 2020 13:15:12 -0500 Subject: [PATCH 2/2] Fixed reduced conveyor edge throughput --- core/src/mindustry/world/blocks/distribution/Conveyor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 777958b83a..51798b8837 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -281,7 +281,7 @@ public class Conveyor extends Block implements Autotiler{ ConveyorEntity e = tile.ent(); if(e.len >= capacity) return false; int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.rotation()); - return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.5f + itemSpace)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation())); + return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.5f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation())); } @Override