Update upstream CB/S

Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -20,7 +20,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index b2aa10ff..0ae2c9c6 100644
+index cf00ee13..96f87cb6 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -37,8 +37,8 @@ index b2aa10ff..0ae2c9c6 100644
              <artifactId>sqlite-jdbc</artifactId>
              <version>3.18.0</version>
 @@ -0,0 +0,0 @@
-             <artifactId>trove4j</artifactId>
              <version>3.0.3</version>
+             <scope>compile</scope>
          </dependency>
 +
 +        <dependency>
@@ -332,7 +332,7 @@ index 463f5890..df6a75b0 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 66e72006..84872520 100644
+index 634cde14..ff805c9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ import java.util.logging.Logger;