From af50699de173d5e0080766db62334e27fbd6cc53 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Tue, 10 Dec 2019 21:35:44 -0800
Subject: [PATCH] 1.15 changes

---
 Changelog.txt                     | 3 +++
 pom.xml                           | 2 +-
 src/main/resources/experience.yml | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 61573aaa8..24111e46d 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,9 @@
 Version 2.1.111
     Further prevent nesting of bleed damage calls
     Warn about reparable/salvage configs with missing sections
+    Added Bee combat experience modifier to experience.yml (Update your experience.yml file, see notes)
+    Breaking a Bee Nest will result in Herbalism XP (Update your experience.yml file, see notes)
+    Breeding bees will now result in Taming XP (Update your experience.yml file, see notes)
 
 Version 2.1.110
     Fixed a dupe bug
diff --git a/pom.xml b/pom.xml
index 558316a82..655cc1cff 100755
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.14.4-R0.1-SNAPSHOT</version>
+            <version>1.15-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
index b4eab61d9..3a43721ea 100644
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@@ -275,6 +275,7 @@ Experience_Values:
         Brown_Mushroom_Block: 70
         Mushroom_Stem: 80
     Herbalism:
+        Bee_Nest: 200
         Sweet_Berry_Bush: 300
         Seagrass: 10
         Tall_Seagrass: 10
@@ -441,6 +442,7 @@ Experience_Values:
             Cat: 500
             Fox: 1000
             Panda: 1000
+            Bee: 100
     Combat:
         Multiplier:
             Animals: 1.0
@@ -502,4 +504,5 @@ Experience_Values:
             Ravager: 4.0
             Trader_Llama: 1.0
             Wandering_trader: 1.0
+            Bee: 1.5