From a50a3aab9c20ff79858f0f15681061bc520caa3b Mon Sep 17 00:00:00 2001
From: Rijackson <richard.jackson@vspec-solutions.com>
Date: Mon, 10 Sep 2018 18:44:52 -0400
Subject: [PATCH 1/2] Removed duplicate ring definitions, fixed a couple of
 typos.

---
 AndorsTrail/res/raw/droplists_graveyard1.json       | 2 +-
 AndorsTrail/res/raw/droplists_trader_teksin.json    | 2 +-
 AndorsTrail/res/raw/itemlist_pathway_fallhaven.json | 2 +-
 AndorsTrail/res/raw/questlist_halvor_surprise.json  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndorsTrail/res/raw/droplists_graveyard1.json b/AndorsTrail/res/raw/droplists_graveyard1.json
index 404d680dc..02a64a6cb 100644
--- a/AndorsTrail/res/raw/droplists_graveyard1.json
+++ b/AndorsTrail/res/raw/droplists_graveyard1.json
@@ -166,7 +166,7 @@
                 }
             },
             {
-                "itemID":"ring_resist",
+                "itemID":"ring_dr1",
                 "chance":"1",
                 "quantity":{
                     "min":1,
diff --git a/AndorsTrail/res/raw/droplists_trader_teksin.json b/AndorsTrail/res/raw/droplists_trader_teksin.json
index c169c0c89..206a0b167 100644
--- a/AndorsTrail/res/raw/droplists_trader_teksin.json
+++ b/AndorsTrail/res/raw/droplists_trader_teksin.json
@@ -59,7 +59,7 @@
                 }
             },
             {
-                "itemID":"ring_dmg_resist",
+                "itemID":"ring_dr1",
                 "chance":"100",
                 "quantity":{
                     "min":1,
diff --git a/AndorsTrail/res/raw/itemlist_pathway_fallhaven.json b/AndorsTrail/res/raw/itemlist_pathway_fallhaven.json
index 3066cf0fa..54d885f6a 100644
--- a/AndorsTrail/res/raw/itemlist_pathway_fallhaven.json
+++ b/AndorsTrail/res/raw/itemlist_pathway_fallhaven.json
@@ -2,7 +2,7 @@
     {
         "id":"jakrar_axe",
         "iconID":"items_weapons:62",
-        "name":"Jakrar's Woodcutting Axe",
+        "name":"Jakrar's woodcutting axe",
         "displaytype":"quest",
         "category":"other"
     }
diff --git a/AndorsTrail/res/raw/questlist_halvor_surprise.json b/AndorsTrail/res/raw/questlist_halvor_surprise.json
index 52697f535..0dfd4dd5e 100644
--- a/AndorsTrail/res/raw/questlist_halvor_surprise.json
+++ b/AndorsTrail/res/raw/questlist_halvor_surprise.json
@@ -60,7 +60,7 @@
             },
             {
                 "progress":100,
-                "logText":"I met Havlor again. He is standing by the lakeside, near an old house, in the north."
+                "logText":"I met Halvor again. He is standing by the lakeside, near an old house, in the north."
             },
             {
                 "progress":110,

From ba75477e0d63d7387f808ed24f9097fd8c3a1402 Mon Sep 17 00:00:00 2001
From: Rijackson <richard.jackson@vspec-solutions.com>
Date: Tue, 11 Sep 2018 20:32:26 -0400
Subject: [PATCH 2/2] Changed the droplists, but forgot to remove the duplicate
 ring definitions. Al fixed now, and ready for PR.

---
 AndorsTrail/res/raw/itemlist_graveyard1.json    | 11 -----------
 AndorsTrail/res/raw/itemlist_trader_teksin.json | 10 ----------
 2 files changed, 21 deletions(-)

diff --git a/AndorsTrail/res/raw/itemlist_graveyard1.json b/AndorsTrail/res/raw/itemlist_graveyard1.json
index 4ff0bc239..532ac34fc 100644
--- a/AndorsTrail/res/raw/itemlist_graveyard1.json
+++ b/AndorsTrail/res/raw/itemlist_graveyard1.json
@@ -132,17 +132,6 @@
             ]
         }
     },
-    {
-        "id":"ring_resist",
-        "iconID":"items_jewelry:5",
-        "name":"Ring of damage resistance",
-        "displaytype":"rare",
-        "category":"ring",
-        "equipEffect":{
-            "increaseBlockChance":0,
-            "increaseDamageResistance":1
-        }
-    },
     {
         "id":"tunic_old",
         "iconID":"items_misc_3:160",
diff --git a/AndorsTrail/res/raw/itemlist_trader_teksin.json b/AndorsTrail/res/raw/itemlist_trader_teksin.json
index 453df0580..1ff8ff0e8 100644
--- a/AndorsTrail/res/raw/itemlist_trader_teksin.json
+++ b/AndorsTrail/res/raw/itemlist_trader_teksin.json
@@ -42,16 +42,6 @@
             ]
         }
     },
-    {
-        "id":"ring_dmg_resist",
-        "iconID":"items_jewelry:2",
-        "name":"Ring of damage resistance",
-        "displaytype":"ordinary",
-        "category":"ring",
-        "equipEffect":{
-            "increaseDamageResistance":1
-        }
-    },
     {
         "id":"cured_ham",
         "iconID":"items_misc_3:70",