EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Add back missing cooldown locale message

Browse Source 
Fixes #4361
This commit is contained in:
nossr50 2020-12-30 15:41:14 -08:00
parent d0d05a33f8
commit 006a7bf277
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -1,6 +1,7 @@
Version 2.1.165 Version 2.1.165
The mcMMO system which tracks player placed blocks has had some major rewrites (thanks t00thpick1) The mcMMO system which tracks player placed blocks has had some major rewrites (thanks t00thpick1)
mcMMO will now be compatible with changes to world height (1.17 compatibility) mcMMO will now be compatible with changes to world height (1.17 compatibility)
Added missing cooldown locale message 'Commands.Database.Cooldown'
NOTES: NOTES:
t00thpick1 has taken time to rewrite our block meta tracking system to be more efficient, easier to maintain, and support upcoming features such as world height changes t00thpick1 has taken time to rewrite our block meta tracking system to be more efficient, easier to maintain, and support upcoming features such as world height changes

1
src/main/resources/locale/locale_en_US.properties
View File

@ -589,6 +589,7 @@ Commands.Cooldowns.Header=&6--= &amcMMO Ability Cooldowns&6 =--
Commands.Cooldowns.Row.N=\ &c{0}&f - &6{1} seconds left Commands.Cooldowns.Row.N=\ &c{0}&f - &6{1} seconds left
Commands.Cooldowns.Row.Y=\ &b{0}&f - &2Ready! Commands.Cooldowns.Row.Y=\ &b{0}&f - &2Ready!
Commands.Database.CooldownMS=You must wait {0} milliseconds before using this command again. Commands.Database.CooldownMS=You must wait {0} milliseconds before using this command again.
Commands.Database.Cooldown=You must wait {0} seconds before using this command again.
Commands.Database.Processing=Your previous command is still being processed. Please wait. Commands.Database.Processing=Your previous command is still being processed. Please wait.
Commands.Disabled=This command is disabled. Commands.Disabled=This command is disabled.
Commands.DoesNotExist= &cPlayer does not exist in the database! Commands.DoesNotExist= &cPlayer does not exist in the database!

2
src/test/java/ChunkStoreTest.java
View File

@ -15,7 +15,7 @@ import java.util.UUID;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
/** /**
* Could be alot better. But some tests are better than none! Tests the major things, still kinda unit-testy. Verifies that the serialization isn't completely broken. * Could be a lot better. But some tests are better than none! Tests the major things, still kinda unit-testy. Verifies that the serialization isn't completely broken.
*/ */
@RunWith(PowerMockRunner.class) @RunWith(PowerMockRunner.class)
@PrepareForTest(Bukkit.class) @PrepareForTest(Bukkit.class)