Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gradle.properties

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFarming.kt

@@ -10,7 +10,7 @@ import org.bukkit.block.data.Ageable
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.block.BlockBreakEvent
-import java.util.EnumMap
+import java.util.*
 
 class SkillFarming : Skill(
     "farming"
@@ -51,7 +51,8 @@ class SkillFarming : Skill(
         }
 
         if (BlockUtils.isPlayerPlaced(event.block) &&
-            (event.block.type == Material.PUMPKIN || event.block.type == Material.MELON || event.block.type == Material.SUGAR_CANE)
+            (event.block.type == Material.PUMPKIN || event.block.type == Material.MELON
+                    || event.block.type == Material.SUGAR_CANE || event.block.type == Material.COCOA)
         ) {
             return
         }

eco-core/core-plugin/src/main/resources/skills/farming.yml

@@ -81,4 +81,4 @@ xp-rewards:
   - "sugar_cane:2"
   - "brown_mushroom:6"
   - "red_mushroom:6"
-  - "cocoa_beans:3"
+  - "cocoa:3"

gradle.properties

@@ -1,2 +1,2 @@
-version = 1.11.8
+version = 1.11.9
 plugin-name = EcoSkills