Merge branch 'main' into database

# Conflicts:
#	dependency-reduced-pom.xml
#	pom.xml
This commit is contained in:
Artemis-the-gr8 2024-01-19 11:53:42 +01:00
commit 00fa1ebc9b
2 changed files with 6 additions and 6 deletions

View File

@ -4,7 +4,7 @@
<groupId>io.github.ithotl</groupId>
<artifactId>PlayerStats</artifactId>
<name>PlayerStats</name>
<version>2.1-SNAPSHOT</version>
<version>2.2</version>
<description>Statistics Plugin</description>
<url>https://www.spigotmc.org/resources/playerstats.102347/</url>
<developers>
@ -235,7 +235,7 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.4</version>
<version>2.11.5</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

@ -6,7 +6,7 @@
<groupId>io.github.ithotl</groupId>
<artifactId>PlayerStats</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2</version>
<name>PlayerStats</name>
<description>Statistics Plugin</description>
@ -73,13 +73,13 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.14.0</version>
<version>4.15.0</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bukkit</artifactId>
<version>4.3.1</version>
<version>4.3.2</version>
</dependency>
<dependency>
@ -105,7 +105,7 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.4</version>
<version>2.11.5</version>
<scope>provided</scope>
</dependency>