From a2933e030a96554a6bc3e62e42700c0de6b02ac7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 27 Jan 2020 15:43:17 -0500
Subject: [PATCH 1/2] More severe votekick

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

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 3f7e0d02ee..2faf856171 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -284,11 +284,11 @@ public class NetServer implements ApplicationListener{
         });
 
         //duration of a a kick in seconds
-        int kickDuration = 20 * 60;
+        int kickDuration = 60 * 60;
         //voting round duration in seconds
         float voteDuration = 0.5f * 60;
         //cooldown between votes
-        int voteCooldown = 60 * 2;
+        int voteCooldown = 60 * 1;
 
         class VoteSession{
             Player target;

From 89e1c5afc0d1bf9a961dd48cf6018b09c42fabbc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 28 Jan 2020 00:21:05 -0500
Subject: [PATCH 2/2] Conveyor tweaks

---
 core/src/mindustry/world/blocks/distribution/Conveyor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
index 51798b8837..983db90810 100644
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -190,7 +190,7 @@ public class Conveyor extends Block implements Autotiler{
 
             if(e.ys[i] > nextMax) e.ys[i] = nextMax;
             if(e.ys[i] > 0.5 && i > 0) e.mid = i - 1;
-            e.xs[i] = Mathf.approachDelta(e.xs[i], 0, 0.1f);
+            e.xs[i] = Mathf.approachDelta(e.xs[i], 0, speed*2);
 
             if(e.ys[i] >= 1f && offloadDir(tile, e.ids[i])){
                 //align X position if passing forwards
@@ -205,7 +205,7 @@ public class Conveyor extends Block implements Autotiler{
             }
         }
 
-        if(e.minitem < itemSpace + (e.blendbits == 1 ? 0.5f : 0f)){
+        if(e.minitem < itemSpace + (e.blendbits == 1 ? 0.3f : 0f)){
             e.clogHeat = Mathf.lerpDelta(e.clogHeat, 1f, 0.02f);
         }else{
             e.clogHeat = 0f;
@@ -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)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation()));
+        return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.7f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation()));
     }
 
     @Override