Merge origin/master

also minor edits
Conflicts:
	pom.xml
This commit is contained in:
John Grosh
2019-05-29 22:26:51 -04:00
9 changed files with 106 additions and 9 deletions

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.jagrosh</groupId>
<artifactId>JMusicBot</artifactId>
<version>0.2.2</version>
<version>0.2.3</version>
<packaging>jar</packaging>
<repositories>
@@ -23,12 +23,12 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>3.8.3_462</version>
<version>3.8.3_463</version>
</dependency>
<dependency>
<groupId>com.sedmelluq</groupId>
<artifactId>lavaplayer</artifactId>
<version>1.3.11</version>
<version>1.3.17</version>
</dependency>
<dependency>
<groupId>com.jagrosh</groupId>
@@ -112,4 +112,4 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
</project>
</project>