Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into limbo

# Conflicts: # src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java # src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java
2017-03-15 08:27:51 +01:00
parent 84acc4557a 457c07b53f
commit 42f46b51d3
10 changed files with 266 additions and 86 deletions
@@ -10,7 +10,7 @@ import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 public final class DatabaseSettings implements SettingsHolder {

    @Comment({"What type of database do you want to use?",
-            "Valid values: sqlite, mysql"})
+            "Valid values: SQLITE, MYSQL"})
    public static final Property<DataSourceType> BACKEND =
        newProperty(DataSourceType.class, "DataSource.backend", DataSourceType.SQLITE);

@@ -81,7 +81,7 @@ public final class RestrictionSettings implements SettingsHolder {
        "Example:",
        "    AllowedRestrictedUser:",
        "    - playername;127.0.0.1"})
-    public static final Property<List<String>> ALLOWED_RESTRICTED_USERS =
+    public static final Property<List<String>> RESTRICTED_USERS =
        newLowercaseListProperty("settings.restrictions.AllowedRestrictedUser");

    @Comment("Ban unknown IPs trying to log in with a restricted username?")