Merge branch 'master' into 674-purge-process-refactor

This commit is contained in:
Gnat008 2016-06-17 20:51:11 -04:00
commit 51663703ea
3 changed files with 5 additions and 4 deletions

View File

@ -54,7 +54,7 @@ McStats: http://mcstats.org/plugin/AuthMe
#####Running Requirements:
>- Java 1.7 (should work also with Java 1.8)
>- Spigot or CraftBukkit (1.7.10, 1.8.X or 1.9-pre1)
>- PaperSpigot, Spigot or CraftBukkit (1.7.10, 1.8.X or 1.9.X)
>- ProtocolLib (optional, required by the protectInventory feature)
<hr>
@ -114,11 +114,11 @@ typing commands or using the inventory. It can also kick players with uncommonly
####Email Recovery Dependency
<a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-configure-email-recovery-system/">How to configure email recovery system?</a>
####Commands
<a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/command/">Command list and usage</a>
<a href="https://github.com/AuthMe-Team/AuthMeReloaded/blob/master/docs/commands.md">Command list and usage</a>
####Permissions
<ul><li>authme.player.* - for all user commands
</li><li>authme.admin.* - for all admin commands
</li><li><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/permissions/">List of all single permissions</a>
</li><li><a href="https://github.com/AuthMe-Team/AuthMeReloaded/blob/master/docs/permission_nodes.md">List of all single permissions</a>
</li></ul>
####How To
<ul><li><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-install-and-initial-configuration/">How to Install and Setup</a>

View File

@ -63,7 +63,7 @@
<!-- BukkitPlugin properties -->
<bukkitplugin.name>${project.outputName}</bukkitplugin.name>
<bukkitplugin.main>${project.groupId}.${project.artifactId}.${bukkitplugin.name}</bukkitplugin.main>
<bukkitplugin.authors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu</bukkitplugin.authors>
<bukkitplugin.authors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu, Gnat008</bukkitplugin.authors>
<!-- Change Bukkit Version HERE! -->
<bukkit.version>1.10-R0.1-SNAPSHOT</bukkit.version>

View File

@ -6,6 +6,7 @@ DNx5 - Developer
ljacqu - Developer
TimVisee - Developer
games647 - Developer
Gnat008 - Developer
Gabriele C. (sgdc3) - Project Manager, Contributor
Retired staff: