Merge remote-tracking branch 'upstream/master' into management-server

Client/.gitignore

@@ -14,5 +14,4 @@ data/cache/
 *.iml
 *.eml
 *.userlibraries
-*.class
 data/players/**

CompiledServer/production/09Scape/.gitignore

@@ -10,6 +10,7 @@ data/profile/**
 .class**
 /bin/
 /out/
+data/cache/
 *.iml
 *.eml
 *.userlibraries

CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

CompiledServer/production/09Scape/runServer.sh

@@ -1,3 +1,5 @@
 rm -rf org
 cp -r ../CompiledServer/production/09Scape/org .
+rm -rf plugin/
+cp -r ../CompiledServer/production/09Scape/org/crandor/plugin .
 java -server -cp ".:./bin;.:./data/libs/*" org.crandor.Server 

Management-Server/.gitignore

@@ -14,6 +14,5 @@ data/cache/
 *.iml
 *.eml
 *.userlibraries
-*.class
 data/players/**
 org/

Server/.gitignore

@@ -7,7 +7,6 @@ data/profile/**
 .DS_Store**
 .project**
 .classpath**
-.class**
 /bin/
 /out/
 *.iml

Server/runServer.sh

@@ -1,3 +1,5 @@
 rm -rf org
 cp -r ../CompiledServer/production/09Scape/org .
+rm -rf plugin/
+cp -r ../CompiledServer/production/09Scape/plugin/ .
 java -server -cp ".:./bin;.:./data/libs/*" org.crandor.Server