Merge branch 'master' of https://github.com/lucko/LuckPerms

bukkit/src/main/resources/luckperms.commodore

@@ -6,7 +6,6 @@ luckperms {
     groups;
     users;
   }
-  debug;
   verbose {
     off;
     on {

common/src/main/java/me/lucko/luckperms/common/command/access/CommandPermission.java

@@ -35,7 +35,6 @@ public enum CommandPermission {
     SYNC("sync", Type.NONE),
     INFO("info", Type.NONE),
     EDITOR("editor", Type.NONE),
-    DEBUG("debug", Type.NONE),
     VERBOSE("verbose", Type.NONE),
     VERBOSE_COMMAND_OTHERS("verbose.command.others", Type.NONE),
     TREE("tree", Type.NONE),

common/src/main/java/me/lucko/luckperms/common/command/spec/CommandSpec.java

@@ -49,7 +49,6 @@ public enum CommandSpec {
             arg("type", false),
             arg("filter", false)
     ),
-    DEBUG("/%s debug"),
     VERBOSE("/%s verbose <on|record|off|upload> [filter]",
             arg("action", "on|record|off|upload|command", true),
             arg("filter", false),
@@ -70,11 +69,14 @@ public enum CommandSpec {
     NETWORK_SYNC("/%s networksync"),
     IMPORT("/%s import <file>",
             arg("file", true),
-            arg("replace", "--replace", false)
+            arg("replace", "--replace", false),
+            arg("upload", "--upload", false)
     ),
     EXPORT("/%s export <file>",
             arg("file", true),
-            arg("without-users", "--without-users", false)
+            arg("without-users", "--without-users", false),
+            arg("without-groups", "--without-groups", false),
+            arg("upload", "--upload", false)
     ),
     RELOAD_CONFIG("/%s reloadconfig"),
     BULK_UPDATE("/%s bulkupdate",

common/src/main/resources/luckperms_en.properties

@@ -103,11 +103,11 @@ luckperms.command.tree.start=Generating permission tree, please wait...
 luckperms.command.tree.empty=Unable to generate tree, no results were found
 luckperms.command.tree.url=Permission tree URL
 luckperms.command.verbose.invalid-filter={0} is not a valid verbose filter
-luckperms.command.verbose.enabled=Verbose logging {0} for checks matching {0}
+luckperms.command.verbose.enabled=Verbose logging {0} for checks matching {1}
 luckperms.command.verbose.command-exec=Forcing {0} to execute command {1} and reporting all checks made...
 luckperms.command.verbose.off=Verbose logging {0}
 luckperms.command.verbose.command-exec-complete=Command execution complete
-luckperms.command.verbose.enabled-recording=Verbose recording {0} for checks matching {0}
+luckperms.command.verbose.enabled-recording=Verbose recording {0} for checks matching {1}
 luckperms.command.verbose.uploading=Verbose logging {0}, uploading results...
 luckperms.command.verbose.url=Verbose results URL
 luckperms.command.verbose.enabled-term=enabled
@@ -352,7 +352,6 @@ luckperms.usage.info.description=Prints general information about the active plu
 luckperms.usage.editor.description=Creates a new web editor session
 luckperms.usage.editor.argument.type=the types to load into the editor. (''all'', ''users'' or ''groups'')
 luckperms.usage.editor.argument.filter=permission to filter user entries by
-luckperms.usage.debug.description=Produces a set of internal debugging output
 luckperms.usage.verbose.description=Controls the plugins verbose permission check monitoring system.
 luckperms.usage.verbose.argument.action=whether to enable/disable logging, or to upload the logged output
 luckperms.usage.verbose.argument.filter=the filter to match entries against
@@ -370,9 +369,12 @@ luckperms.usage.network-sync.description=Sync changes with the storage and reque
 luckperms.usage.import.description=Imports data from a (previously created) export file
 luckperms.usage.import.argument.file=the file to import from
 luckperms.usage.import.argument.replace=replace existing data instead of merging
+luckperms.usage.import.argument.upload=upload the data from a previous export
 luckperms.usage.export.description=Exports all permissions data to an ''export'' file. Can be re-imported at a later time.
 luckperms.usage.export.argument.file=the file to export to
 luckperms.usage.export.argument.without-users=exclude users from the export
+luckperms.usage.export.argument.without-groups=exclude groups from the export
+luckperms.usage.export.argument.upload=Upload all permission data to the webeditor. Can be re-imported at a later time.
 luckperms.usage.reload-config.description=Reload some of the config options
 luckperms.usage.bulk-update.description=Execute bulk change queries on all data
 luckperms.usage.bulk-update.argument.data-type=the type of data being changed. (''all'', ''users'' or ''groups'')