Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1141-optional-additional-2fa-auth

Browse Source 
# Conflicts:
#	src/main/java/fr/xephi/authme/permission/PlayerPermission.java
#	src/main/java/fr/xephi/authme/service/BukkitService.java
This commit is contained in:
ljacqu
2018-03-20 23:07:25 +01:00
parent 495cfc69a9 6251a69d3e
commit f66a8a5b06
43 changed files with 306 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/messages/messages_en.yml
+1
View File
@@ -78,6 +78,7 @@ on_join_validation:
same_nick_online: '&4The same username is already playing on the server!'
invalid_name_case: 'You should join using username %valid, not %invalid.'
same_ip_online: 'A player with the same IP is already in game!'
quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.'
# Email
email: