Merge branch 'master' into locale.

This commit is contained in:
GJ
2012-04-23 22:29:24 -04:00
8 changed files with 46 additions and 19 deletions

View File

@ -271,6 +271,7 @@ Experience:
Ender_Dragon: 8.0
Slime: 2.0
Ghast: 3.0
Iron_Golem: 2.0
#
# Settings for commands
###

View File

@ -266,7 +266,7 @@ permissions:
mcmmo.ability.repair.diamondrepair: true
mcmmo.ability.repair.armorrepair: true
mcmmo.ability.repair.toolrepair: true
mcmmo.ability.repair.bowrepair: true
mcmmo.ability.repair.stringrepair: true
mcmmo.ability.repair.repairbonus:
description: Allows access to Super Repair bonus
mcmmo.ability.repair.arcaneforging:
@ -287,8 +287,8 @@ permissions:
description: Allows ability to repair armor
mcmmo.ability.repair.toolrepair:
description: Allows ability to repair tools
mcmmo.ability.repair.bowrepair:
description: Allows ability to repair bows
mcmmo.ability.repair.stringrepair:
description: Allows ability to repair Bow and Fishing rod
mcmmo.ability.unarmed.*:
description: Allows access to all Unarmed abilities
children:
@ -461,4 +461,4 @@ permissions:
mcmmo.skills.acrobatics:
description: Allows access to the Acrobatics skill
mcmmo.skills.blastmining:
description: Allows access to the Blast Mining subskill for Mining
description: Allows access to the Blast Mining subskill for Mining