EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge v5/v6

Browse Source
This commit is contained in:
N0tMyFaultOG
2020-09-02 16:44:18 +02:00
parent e924a1920e 03c889383b
commit cba2474df7
5 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/build.gradle
View File

@ -6,7 +6,7 @@ repositories {
def textVersion = "3.0.2"
dependencies {
implementation("org.yaml:snakeyaml:1.25")
implementation("org.yaml:snakeyaml:1.26")
implementation("com.google.code.gson:gson:2.8.6") {
because("Minecraft uses GSON 2.8.0")
force = true

2
Core/src/main/java/com/plotsquared/core/configuration/Settings.java
View File

@ -587,6 +587,8 @@ public class Settings extends Config {
public static boolean EXTENDED_USERNAME_COMPLETION = true;
@Comment("Command aliases that will be tab completed")
public static List<String> TAB_COMPLETED_ALIASES = Arrays.asList("plot", "plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap");
@Comment("Whether PlotSquared should hook into MvDWPlaceholderAPI or not")
public static boolean USE_MVDWAPI = true;
}
}