From 10e4f928dfdc56e6b58cf0542d94e9db86a9c102 Mon Sep 17 00:00:00 2001
From: Scott Surette <scott.surette@duckcreek.com>
Date: Thu, 1 Jun 2017 13:16:08 -0400
Subject: [PATCH 1/2] removed duplicate oak resin entry, added bundle 25 to
 original oak resin, adjusted ids

---
 bundles.json | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/bundles.json b/bundles.json
index f121de1..0393f96 100644
--- a/bundles.json
+++ b/bundles.json
@@ -198,7 +198,7 @@
       "source": "Harvested from oak trees using a Tapper.",
       "seasons": ["spring", "summer", "fall", "winter"],
       "skills": ["foraging"],
-      "bundles": [5]
+      "bundles": [5, 25]
     },
     {
       "id": 25,
@@ -930,14 +930,6 @@
     },
     {
       "id": 116,
-      "name": "Oak Resin",
-      "source": "Harvested from oak trees using a Tapper.",
-      "seasons": ["spring", "summer", "fall", "winter"],
-      "skills": ["foraging"],
-      "bundles": [25]
-    },
-    {
-      "id": 117,
       "name": "Wine",
       "source": "Produced by putting most fruits into a keg.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -945,7 +937,7 @@
       "bundles": [25]
     },
     {
-      "id": 118,
+      "id": 117,
       "name": "Rabbit's Foot",
       "source": "Dropped by Rabbits in the Coop, also dropped by a Serpent in Skull Cavern (0.8%).",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -953,7 +945,7 @@
       "bundles": [25]
     },
     {
-      "id": 119,
+      "id": 118,
       "name": "2,500 Gold",
       "source": "Collect 2,500 Gold and turn in.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -961,7 +953,7 @@
       "bundles": [26]
     },
     {
-      "id": 120,
+      "id": 119,
       "name": "5,000 Gold",
       "source": "Collect 5,000 Gold and turn in.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -969,7 +961,7 @@
       "bundles": [27]
     },
     {
-      "id": 121,
+      "id": 120,
       "name": "10,000 Gold",
       "source": "Collect 10,000 Gold and turn in.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -977,7 +969,7 @@
       "bundles": [28]
     },
     {
-      "id": 122,
+      "id": 121,
       "name": "25,000 Gold",
       "source": "Collect 25,000 Gold and turn in.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -1258,7 +1250,7 @@
     },
     {
       "id": "mining",
-      "name": "Mining" 
+      "name": "Mining"
     },
     {
       "id": "foraging",

From 5c3327063d67ff26fc3ab782176413ed1439ddc5 Mon Sep 17 00:00:00 2001
From: Scott Surette <scott.surette@duckcreek.com>
Date: Fri, 2 Jun 2017 10:16:44 -0400
Subject: [PATCH 2/2] reverted item ids to old values to preserve user data

---
 bundles.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles.json b/bundles.json
index 0393f96..07febdd 100644
--- a/bundles.json
+++ b/bundles.json
@@ -929,7 +929,7 @@
       "bundles": [24]
     },
     {
-      "id": 116,
+      "id": 117,
       "name": "Wine",
       "source": "Produced by putting most fruits into a keg.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -937,7 +937,7 @@
       "bundles": [25]
     },
     {
-      "id": 117,
+      "id": 118,
       "name": "Rabbit's Foot",
       "source": "Dropped by Rabbits in the Coop, also dropped by a Serpent in Skull Cavern (0.8%).",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -945,7 +945,7 @@
       "bundles": [25]
     },
     {
-      "id": 118,
+      "id": 119,
       "name": "2,500 Gold",
       "source": "Collect 2,500 Gold and turn in.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -953,7 +953,7 @@
       "bundles": [26]
     },
     {
-      "id": 119,
+      "id": 120,
       "name": "5,000 Gold",
       "source": "Collect 5,000 Gold and turn in.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -961,7 +961,7 @@
       "bundles": [27]
     },
     {
-      "id": 120,
+      "id": 121,
       "name": "10,000 Gold",
       "source": "Collect 10,000 Gold and turn in.",
       "seasons": ["spring", "summer", "fall", "winter"],
@@ -969,7 +969,7 @@
       "bundles": [28]
     },
     {
-      "id": 121,
+      "id": 122,
       "name": "25,000 Gold",
       "source": "Collect 25,000 Gold and turn in.",
       "seasons": ["spring", "summer", "fall", "winter"],