From f14df524909d390d8032e80e82a6b239594b3bdc Mon Sep 17 00:00:00 2001
From: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com>
Date: Tue, 11 Feb 2020 17:10:50 +0100
Subject: [PATCH 1/2] Allow admins to bypass the playerlimit [server] (#1549)

---
 core/src/mindustry/core/NetServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 818fc0fa58..5734ee7885 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -131,7 +131,7 @@ public class NetServer implements ApplicationListener{
                 return;
             }
 
-            if(admins.getPlayerLimit() > 0 && playerGroup.size() >= admins.getPlayerLimit()){
+            if(admins.getPlayerLimit() > 0 && playerGroup.size() >= admins.getPlayerLimit() && !netServer.admins.isAdmin(uuid, packet.usid)){
                 con.kick(KickReason.playerLimit);
                 return;
             }

From eaa0b53f3096386954f352e7f3797d643c61ab7c Mon Sep 17 00:00:00 2001
From: AmateurPotion <47741752+AmateurPotion@users.noreply.github.com>
Date: Wed, 12 Feb 2020 01:13:26 +0900
Subject: [PATCH 2/2] Update README.md (#1548)

hey?
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 088d6576fb..8d1e484093 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ First, make sure you have [JDK 8](https://adoptopenjdk.net/) installed. Open a t
 
 #### Windows
 
-_Running:_ `gradlew desktop:run`  
-_Building:_ `gradlew desktop:dist`  
-_Sprite Packing:_ `gradlew tools:pack`
+_Running:_ `gradlew.bat desktop:run`  
+_Building:_ `gradlew.bat desktop:dist`  
+_Sprite Packing:_ `gradlew.bat tools:pack`
 
 #### Linux/Mac OS