Merge branch 'dev-webconsole' into dev-zond

# Conflicts: # bridge/build.gradle # bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java # bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java
2017-06-14 21:34:15 +03:00
parent 3a3efc842a 2fca454179
commit 42000692fc
26 changed files with 478 additions and 314 deletions
--- a/mcserver-manager/build.gradle
+++ b/mcserver-manager/build.gradle
@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.8.13-SNAPSHOT'
+version = '0.10.4-SNAPSHOT'

 apply plugin: 'osgi'

@@ -8,6 +8,10 @@ configurations {
    compile.extendsFrom include
 }

+compileJava {
+    dependsOn ':bridge-protocol:compileJava'
+}
+
 jar {
    manifest {
        name = 'ASys MC server manager'