Merge branch 'development' into FS-273

This commit is contained in:
Ryan 2021-09-11 01:23:13 +01:00 committed by GitHub
commit 47e6386907
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

18
pom.xml
View File

@ -41,8 +41,8 @@
<repositories>
<repository>
<id>totalfreedom-development</id>
<url>https://atlasmedia.jfrog.io/artifactory/totalfreedom-development/</url>
<id>atlas-nexus-01-totalfreedom-development</id>
<url>https://nexus-01.core.atlas-media.co.uk/repository/totalfreedom-development/</url>
</repository>
<repository>
@ -133,9 +133,9 @@
</dependency>
<dependency>
<groupId>ca.momoperes</groupId>
<artifactId>mojangson</artifactId>
<version>1.0-20210821.193420-1</version>
<groupId>com.github.speedxx</groupId>
<artifactId>Mojangson</artifactId>
<version>1957eef8d6</version>
</dependency>
<dependency>
@ -230,10 +230,10 @@
</dependency>
<dependency>
<groupId>com.github.AtlasMediaGroup</groupId>
<artifactId>TFGuilds</artifactId>
<version>master-SNAPSHOT</version>
<scope>provided</scope>
<groupId>me.totalfreedom</groupId>
<artifactId>tfguilds</artifactId>
<version>2021.06-RC2</version>
<scope>compile</scope>
</dependency>
<dependency>