EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-01 20:15:28 +02:00
Code Issues Projects Releases Wiki Activity

Merge 2.1.44

Browse Source
This commit is contained in:
nossr50
2019-04-15 10:40:57 -07:00
parent 7cf3b4e521 31c1bd52bc
commit 7e039321e1
67 changed files with 655 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,7 +573,7 @@ Commands.Chat.Console=*Console*
Commands.Cooldowns.Header=[[GOLD]]--= [[GREEN]]mcMMO Ability Cooldowns[[GOLD]] =--
Commands.Cooldowns.Row.N=\ [[RED]]{0}[[WHITE]] - [[GOLD]]{1} seconds left
Commands.Cooldowns.Row.Y=\ [[AQUA]]{0}[[WHITE]] - [[DARK_GREEN]]Ready!
Commands.Database.Cooldown=You must wait {0} seconds before using this command again.
Commands.Database.CooldownMS=You must wait {0} milliseconds before using this command again.
Commands.Database.Processing=Your previous command is still being processed. Please wait.
Commands.Disabled=This command is disabled.
Commands.DoesNotExist= [[RED]]Player does not exist in the database!
@@ -1072,6 +1072,7 @@ Scoreboard.Misc.Cooldown=[[LIGHT_PURPLE]]Cooldown
Scoreboard.Misc.Overall=[[GOLD]]Overall
Scoreboard.Misc.Ability=Super Ability
#DATABASE RECOVERY
Profile.PendingLoad=[[RED]]Your mcMMO player data has not yet been loaded.
Profile.Loading.Success=[[GREEN]]Your mcMMO profile has been loaded.
Profile.Loading.FailurePlayer=[[RED]]mcMMO is having trouble loading your data, we have attempted to load it [[GREEN]]{0}[[RED]] times.[[LIGHT_GRAY]] You may want to contact the server admins about this issue. mcMMO will attempt to load your data until you disconnect, you will not gain XP or be able to use skills while the data is not loaded.
Profile.Loading.FailureNotice=[[DARK_RED]][A][[RED]] mcMMO was unable to load the player data for [[YELLOW]]{0}[[RED]]. [[LIGHT_PURPLE]]Please inspect your database setup. Attempts made so far {1}.

19
src/main/resources/plugin.yml
View File

@@ -1281,6 +1281,8 @@ permissions:
default: false
description: implies access to all mcmmo perks
children:
mcmmo.perks.bypass.salvageenchant: true
mcmmo.perks.bypass.repairenchant: true
mcmmo.perks.activationtime.all: true
mcmmo.perks.cooldowns.all: true
mcmmo.perks.lucky.all: true
@@ -1297,6 +1299,23 @@ permissions:
mcmmo.perks.activationtime.eightseconds: true
mcmmo.perks.activationtime.fourseconds: true
mcmmo.perks.activationtime.twelveseconds: true
mcmmo.perks.bypass.*:
default: false
description: Perks that bypass certain RNG elements and guarantee success
children:
mcmmo.perks.bypass.all: true
mcmmo.perks.bypass.all:
default: false
description: Perks that bypass certain RNG elements and guarantee success
children:
mcmmo.perks.bypass.repairenchant: true
mcmmo.perks.bypass.salvageenchant: true
mcmmo.perks.bypass.repairenchant:
default: false
description: Guarantees repairing without enchantment degradation
mcmmo.perks.bypass.salvageenchant:
default: false
description: Guarantees salvage will return the best legal enchantment book
mcmmo.perks.activationtime.eightseconds:
default: false
description: Increases activation time by 8 seconds