EpicKnarvik97/Factions3
EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'notbroken'

Browse Source 
# Conflicts:
#	src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java
#	src/main/java/net/knarcraft/factions/chat/tag/ChatTagName.java
#	src/main/java/net/knarcraft/factions/engine/EngineCanCombatHappen.java
#	src/main/java/net/knarcraft/factions/engine/EngineDenyTeleport.java
#	src/main/java/net/knarcraft/factions/engine/EngineFly.java
#	src/main/java/net/knarcraft/factions/engine/EnginePermBuild.java
#	src/main/java/net/knarcraft/factions/engine/EngineTeleportHomeOnDeath.java
#	src/main/java/net/knarcraft/factions/entity/Board.java
#	src/main/java/net/knarcraft/factions/entity/Faction.java
#	src/main/java/net/knarcraft/factions/entity/MPlayer.java
#	src/main/java/net/knarcraft/factions/entity/Warp.java
#	src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java
#	src/main/java/net/knarcraft/factions/integration/Econ.java
#	src/main/java/net/knarcraft/factions/integration/lwc/EngineLwc.java
#	src/main/java/net/knarcraft/factions/task/TaskTax.java
This commit is contained in:
Kristian Knarvik 2023-04-01 14:54:17 +02:00
commit f1ecb77a09
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- Basics --> <!-- Basics -->
<groupId>net.knarcraft</groupId> <groupId>com.massivecraft.factions</groupId>
<artifactId>Factions</artifactId> <artifactId>Factions</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -18,8 +18,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>16</maven.compiler.target>
</properties> </properties>
<repositories> <repositories>
@ -51,7 +51,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.19.1-R0.1-SNAPSHOT</version> <version>1.19.4-R0.1-SNAPSHOT</version>
</dependency> </dependency>
<!-- MassiveCore --> <!-- MassiveCore -->
<dependency> <dependency>
@ -139,8 +139,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version> <version>3.7.0</version>
<configuration> <configuration>
<source>17</source> <source>16</source>
<target>17</target> <target>16</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>