Upstream
/
Minepacks
mirror of https://github.com/GeorgH93/Minepacks.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
GeorgH93 2021-06-18 18:32:40 +02:00
parent 9c91bbaeda f159e72388
commit 3d1c40b9b4
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Minepacks/pom.xml
View File

@ -25,8 +25,16 @@
<mainClass>${project.groupId}.${project.artifactId}.Bukkit.${project.artifactId}</mainClass>
<releaseType>Normal</releaseType>
<updateChannel>Release</updateChannel>
<mavenShade.version>3.3.0-SNAPSHOT</mavenShade.version>
</properties>
<pluginRepositories>
<pluginRepository>
<id>apache-snapshot</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
<!-- Minepacks API -->
<dependency>
@ -84,7 +92,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>${mavenShade.version}</version>
<executions>
<execution>
<phase>package</phase>
@ -160,7 +168,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>${mavenShade.version}</version>
<executions>
<execution>
<phase>package</phase>
@ -264,7 +272,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>${mavenShade.version}</version>
<executions>
<execution>
<phase>package</phase>

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/MagicValues.java
View File

@ -19,7 +19,7 @@ package at.pcgamingfreaks.Minepacks.Bukkit;
public class MagicValues
{
public static final String MIN_PCGF_PLUGIN_LIB_VERSION = "1.0.32-SNAPSHOT";
public static final String MIN_PCGF_PLUGIN_LIB_VERSION = "1.0.33-SNAPSHOT";
public static final String BACKPACK_STYLE_NAME_DEFAULT = "default";
public static final String BACKPACK_STYLE_NAME_DISABLED = "none";
}

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
View File

@ -129,7 +129,7 @@ public class Minepacks extends JavaPlugin implements MinepacksPluginExtended
private boolean checkMcVersion()
{
if(MCVersion.is(MCVersion.UNKNOWN) || MCVersion.isOlderThan(MCVersion.MC_1_8) || MCVersion.isNewerThan(MCVersion.MC_NMS_1_16_R3))
if(MCVersion.is(MCVersion.UNKNOWN) || MCVersion.isOlderThan(MCVersion.MC_1_8) || MCVersion.isNewerThan(MCVersion.MC_NMS_1_17_R1))
{
getLogger().warning(ConsoleColor.RED + "################################" + ConsoleColor.RESET);
getLogger().warning(ConsoleColor.RED + String.format("Your server version (%1$s) is currently not compatible with your current version (%2$s) of the plugin. " +

2
pom.xml
View File

@ -10,7 +10,7 @@
<revision>3.0-ALPHA-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<pcgfPluginLibVersion>1.0.32-SNAPSHOT</pcgfPluginLibVersion>
<pcgfPluginLibVersion>1.0.33-SNAPSHOT</pcgfPluginLibVersion>
</properties>
<scm>