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

Merge pull request #3279 from ezeiger92/master

Browse Source 
Pull downstream changes
This commit is contained in:
t00thpick1 2017-08-31 00:08:32 -04:00 committed by GitHub
commit 2d7c5d7fd6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -135,7 +135,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.12-pre2-SNAPSHOT</version> <version>1.12.1-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -649,6 +649,6 @@ public class FishingManager extends SkillManager {
} }
} }
return 0; return 1;
} }
} }

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

@ -340,7 +340,7 @@ permissions:
mcmmo.ability.herbalism.greenthumb.plants.crops: true mcmmo.ability.herbalism.greenthumb.plants.crops: true
mcmmo.ability.herbalism.greenthumb.plants.netherwarts: true mcmmo.ability.herbalism.greenthumb.plants.netherwarts: true
mcmmo.ability.herbalism.greenthumb.plants.potato: true mcmmo.ability.herbalism.greenthumb.plants.potato: true
mcmmo.ability.herbalism.greenthumb.plants.beetroot: true mcmmo.ability.herbalism.greenthumb.plants.beetrootblock: true
mcmmo.ability.herbalism.greenthumb.plants.carrot: mcmmo.ability.herbalism.greenthumb.plants.carrot:
description: Allows access to the Green Thumb ability for carrots description: Allows access to the Green Thumb ability for carrots
mcmmo.ability.herbalism.greenthumb.plants.cocoa: mcmmo.ability.herbalism.greenthumb.plants.cocoa:
@ -351,7 +351,7 @@ permissions:
description: Allows access to the Green Thumb ability for netherwart description: Allows access to the Green Thumb ability for netherwart
mcmmo.ability.herbalism.greenthumb.plants.potato: mcmmo.ability.herbalism.greenthumb.plants.potato:
description: Allows access to the Green Thumb ability for potatoes description: Allows access to the Green Thumb ability for potatoes
mcmmo.ability.herbalism.greenthumb.plants.beetroot: mcmmo.ability.herbalism.greenthumb.plants.beetrootblock:
description: Allows access to the Green Thumb ability for beetrootes description: Allows access to the Green Thumb ability for beetrootes
mcmmo.ability.herbalism.hylianluck: mcmmo.ability.herbalism.hylianluck:
description: Allows access to the Hylian Luck ability description: Allows access to the Hylian Luck ability