Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	src/main/java/com/songoda/ultimatestacker/database/DataManager.java
This commit is contained in:
Fernando Pettinelli 2021-10-16 21:23:02 -03:00
commit 87563a9ce9

View File

@ -56,7 +56,6 @@
<artifactSet>
<includes>
<include>com.songoda:SongodaCore</include>
<include>com.songoda:Lootables</include>
<include>com.zaxxer:HikariCP</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-nop</include>
@ -127,11 +126,6 @@
<version>LATEST</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>Lootables</artifactId>
<version>1.0.9</version>
</dependency>
<dependency>
<groupId>com.bgsoftware</groupId>
<artifactId>wildstacker</artifactId>