Finished pre patch day merge

2019-05-23 01:39:15 -04:00
parent e3c075260e fac3d0cb4c
commit 9c536ce939
18 changed files with 694 additions and 824 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_magic.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_magic.json
@@ -460,7 +460,7 @@
      "level": 60,
      "sprite": 354,
      "name": "Bones To Peaches",
-      "xp": 65
+      "xp": 35.5
    },
    {
      "level": 61,