Merge branch 'dev'

.gitignore

@@ -8,3 +8,6 @@
 build/*
 *.jar
 !gradle/wrapper/gradle-wrapper.jar
+.project
+.classpath
+.settings

LavalinkServer/build.gradle

@@ -18,8 +18,7 @@ bootJar {
     archiveName = "Lavalink.jar"
 }
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = targetCompatibility = 1.8
 
 bootRun {
     //compiling tests during bootRun increases the likelihood of catching broken tests locally instead of on the CI
@@ -38,7 +37,7 @@ test {
 }
 
 dependencies {
-    compile group: 'space.npstr', name: 'Magma', version: magmaVersion
+    compile group: 'club.minnced', name: 'magma', version: magmaVersion
     compile group: 'com.sedmelluq', name: 'lavaplayer', version: lavaplayerVersion
     compile group: 'com.sedmelluq', name: 'jda-nas', version: jdaNasVersion
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion

LavalinkServer/src/main/java/lavalink/server/config/ServerConfig.java

@@ -50,7 +50,7 @@ public void setPassword(String password) {
     /**
      * @deprecated use {@link SentryConfigProperties} instead.
      */
-    @Deprecated(since = "3")
+    @Deprecated
     public String getSentryDsn() {
         return sentryDsn;
     }

build.gradle

@@ -24,7 +24,7 @@ allprojects {
         mavenCentral()                     // main maven repo
         jcenter()                          // JDA and some other stuff
         mavenLocal()                       // useful for developing
-        maven { url "https://jitpack.io" } // build projects directly from github 
+        maven { url "https://jitpack.io" } // build projects directly from github
     }
 
     group = 'lavalink'
@@ -50,7 +50,7 @@ subprojects {
         //@formatter:off
 
         lavaplayerVersion               = '1.3.10'
-        magmaVersion                    = '0.8.3'
+        magmaVersion                    = '0.9.0'
         jdaNasVersion                   = '1.0.6'
         jappVersion                     = '1.3'