Merge pull request #3 from Zukero/master

merge from zukero

AndorsTrail/res/raw/droplists_graveyard1.json

@@ -166,7 +166,7 @@
                 }
             },
             {
-                "itemID":"ring_resist",
+                "itemID":"ring_dr1",
                 "chance":"1",
                 "quantity":{
                     "min":1,

AndorsTrail/res/raw/droplists_trader_teksin.json

@@ -59,7 +59,7 @@
                 }
             },
             {
-                "itemID":"ring_dmg_resist",
+                "itemID":"ring_dr1",
                 "chance":"100",
                 "quantity":{
                     "min":1,

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",

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"
     }

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",

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,