Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-26 20:26:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1539-datasource-columns-integration

Browse Source
This commit is contained in:
ljacqu 2018-04-02 22:33:26 +02:00
commit ad9e6dbb6d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -27,7 +27,7 @@
<ciManagement> <ciManagement>
<system>jenkins</system> <system>jenkins</system>
<url>http://ci.codemc.org/job/AuthMeReloaded/</url> <url>http://ci.codemc.org/job/AuthMe/job/AuthMeReloaded/</url>
</ciManagement> </ciManagement>
<issueManagement> <issueManagement>
@ -395,7 +395,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>24.0-jre</version> <version>24.1-jre</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -816,7 +816,7 @@
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
<version>2.15.0</version> <version>2.16.0</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest-core</artifactId>

2
src/main/resources/messages/messages_pl.yml
View File

@ -79,7 +79,7 @@ on_join_validation:
country_banned: '&4Ten kraj jest zbanowany na tym serwerze' country_banned: '&4Ten kraj jest zbanowany na tym serwerze'
not_owner_error: '&cNie jesteś właścicielem tego konta, wybierz inny nick!' not_owner_error: '&cNie jesteś właścicielem tego konta, wybierz inny nick!'
invalid_name_case: '&cPowinieneś dołączyć do serwera z nicku %valid, a nie %invalid.' invalid_name_case: '&cPowinieneś dołączyć do serwera z nicku %valid, a nie %invalid.'
# TODO quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.' quick_command: '&cUżyłeś komendy zbyt szybko! Ponownie dołącz do serwera i poczekaj chwilę, zanim użyjesz dowolnej komendy.'
# Email # Email
email: email: