Update B/CB/S

This commit is contained in:
Shane Freeder
2017-11-17 09:40:49 +00:00
parent f77372c65e
commit 03960c3d95
11 changed files with 60 additions and 41 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index c73b4b4f5..0c4398228 100644
index 65dd49259..d49a624ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -163,6 +163,18 @@ index c73b4b4f5..0c4398228 100644
<configuration>
<workingDirectory>${basedir}/target/test-server</workingDirectory>
<excludes>
@@ -0,0 +0,0 @@
<profiles>
<profile>
<id>development</id>
+ <!-- Paper start - activate by default -->
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <!-- Paper end -->
<build>
<plugins>
<plugin>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 93046379d..674096cab 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java