diff --git a/Artifacts/SubServers.Bungee.Patcher.sh b/Artifacts/SubServers.Bungee.Patcher.sh index 1ba8d666..7dd1663c 100644 --- a/Artifacts/SubServers.Bungee.Patcher.sh +++ b/Artifacts/SubServers.Bungee.Patcher.sh @@ -41,6 +41,8 @@ if [ $retvala -eq 0 ] fi if [ -f "META-INF/MANIFEST.MF" ]; then cat META-INF/MANIFEST.MF | sed -e "/^\s*$/d" -e "/^Main-Class:.*$/d" -e "/^Implementation-Title:.*$/d" -e "/^Build-Jdk:.*$/d" -e "/^Created-By:.*$/d" -e "/^Built-By:.*$/d" > ../MANIFEST.MF + else + printf "Manifest-Version: 1.0\n" > ../MANIFEST.MF fi if [ -f "MODIFICATIONS" ]; then mv -f MODIFICATIONS ../MODIFICATIONS @@ -54,7 +56,7 @@ if [ $retvala -eq 0 ] echo ">> Writing Changes..." if [ -f "META-INF/MANIFEST.MF" ] then - cat META-INF/MANIFEST.MF | sed -e "/^\s*$/d" -e "/^Manifest-Version:.*$/d" -e "/^Class-Path:.*$/d" >> ../MANIFEST.MF + cat META-INF/MANIFEST.MF | sed -e "/^\s*$/d" -e "/^Manifest-Version:.*$/d" -e "/^Class-Path:.*$/d" -e "/^Build-Jdk:.*$/d" -e "/^Created-By:.*$/d" -e "/^Built-By:.*$/d" >> ../MANIFEST.MF else if [ ! -d "META-INF" ]; then mkdir META-INF @@ -78,7 +80,7 @@ if [ $retvala -eq 0 ] if [ -f "../../SubServers.Patched.jar" ]; then rm -Rf ../../SubServers.Patched.jar fi - jar cvfm ../../SubServers.Patched.jar ../MANIFEST.MF .; retvalc=$?; + jar cvfm ../../SubServers.Patched.jar META-INF/MANIFEST.MF .; retvalc=$?; if [ $retvalc -eq 0 ] then echo ">> Cleaning Up..." diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index 9ff87800..243c49ce 100644 Binary files a/Artifacts/SubServers.Bungee.jar and b/Artifacts/SubServers.Bungee.jar differ diff --git a/Artifacts/SubServers.Client.Bukkit.jar b/Artifacts/SubServers.Client.Bukkit.jar index c70eb0e7..043b43e8 100644 Binary files a/Artifacts/SubServers.Client.Bukkit.jar and b/Artifacts/SubServers.Client.Bukkit.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index 62f6b6dc..129ac6a1 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Artifacts/SubServers.Sync.jar b/Artifacts/SubServers.Sync.jar index 8f1e559f..1d9a33e5 100644 Binary files a/Artifacts/SubServers.Sync.jar and b/Artifacts/SubServers.Sync.jar differ diff --git a/Javadoc/SubServers.Bungee.jar b/Javadoc/SubServers.Bungee.jar index 30061123..5aae0334 100644 Binary files a/Javadoc/SubServers.Bungee.jar and b/Javadoc/SubServers.Bungee.jar differ diff --git a/Javadoc/SubServers.Client.Bukkit.jar b/Javadoc/SubServers.Client.Bukkit.jar index f01c5f85..fd0ca54f 100644 Binary files a/Javadoc/SubServers.Client.Bukkit.jar and b/Javadoc/SubServers.Client.Bukkit.jar differ diff --git a/Javadoc/SubServers.Host.jar b/Javadoc/SubServers.Host.jar index a6e15949..b6c835e7 100644 Binary files a/Javadoc/SubServers.Host.jar and b/Javadoc/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Sync.jar b/Javadoc/SubServers.Sync.jar index 3a086247..62baca66 100644 Binary files a/Javadoc/SubServers.Sync.jar and b/Javadoc/SubServers.Sync.jar differ diff --git a/SubServers.Bungee/src.jar b/SubServers.Bungee/src.jar index f64e20b8..71c54dea 100644 Binary files a/SubServers.Bungee/src.jar and b/SubServers.Bungee/src.jar differ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index 15d34b34..6142b92f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java @@ -60,7 +60,7 @@ public final class SubPlugin extends BungeeCord implements Listener { public SubServer sudo = null; //public static final Version version = new Version("2.13a"); //public static final Version version = new Version(new Version("2.13a"), VersionType.BETA, 1); // TODO Beta Version Setting - public static final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3), VersionType.BETA, 5); // TODO Beta Version Setting + public static final Version version = new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3); // TODO Beta Version Setting public boolean redis = false; public boolean canSudo = true; diff --git a/SubServers.Client/Bukkit/src.jar b/SubServers.Client/Bukkit/src.jar index 86df5716..09309734 100644 Binary files a/SubServers.Client/Bukkit/src.jar and b/SubServers.Client/Bukkit/src.jar differ diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index 4b4d5219..4bf766e9 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -48,7 +48,7 @@ public final class SubPlugin extends JavaPlugin { super(); //version = new Version(getDescription().getVersion()); //version = new Version(new Version(getDescription().getVersion()), VersionType.BETA, 1); // TODO Beta Version Setting - version = new Version(new Version(new Version(getDescription().getVersion()), VersionType.PRE_RELEASE, 3), VersionType.BETA, 5); // TODO Beta Version Setting + version = new Version(new Version(getDescription().getVersion()), VersionType.PRE_RELEASE, 3); // TODO Beta Version Setting } /** diff --git a/SubServers.Host/src.jar b/SubServers.Host/src.jar index 78e017ee..2c8ddccd 100644 Binary files a/SubServers.Host/src.jar and b/SubServers.Host/src.jar differ diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index a68b15ac..2e728e37 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -53,7 +53,7 @@ public final class ExHost { //public final Version version = new Version("2.13a"); //public final Version version = new Version(new Version("2.13a"), VersionType.BETA, 1); // TODO Beta Version Setting - public final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3), VersionType.BETA, 5); // TODO Beta Version Setting + public final Version version = new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3); // TODO Beta Version Setting public final SubAPI api = new SubAPI(this); private ConsoleReader jline; diff --git a/SubServers.Sync/src.jar b/SubServers.Sync/src.jar index db6e659c..1bb148ad 100644 Binary files a/SubServers.Sync/src.jar and b/SubServers.Sync/src.jar differ diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java index b16960ea..e54bd61a 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java @@ -50,7 +50,7 @@ public final class SubPlugin extends BungeeCord implements Listener { public SubDataClient subdata = null; //public static final Version version = new Version("2.13a"); //public static final Version version = new Version(new Version("2.13a"), VersionType.BETA, 1); // TODO Beta Version Setting - public static final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3), VersionType.BETA, 5); // TODO Beta Version Setting + public static final Version version = new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3); // TODO Beta Version Setting public final boolean isPatched; public long lastReload = -1;