Merge branch 'master' into loot-tracker-reset

2019-07-08 19:36:32 -04:00
parent d8fbd902cc 6e8b19fea7
commit 1a47f8e4b1
1232 changed files with 51400 additions and 46135 deletions
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -9101,5 +9101,9 @@
    23321,
    23324,
    23327
+  ],
+  "giant egg sac": [
+    23517,
+    23520
  ]
 }
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/info/folder_icon.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/info/folder_icon.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/info/wiki_icon.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/info/wiki_icon.png
--- a/runelite-client/src/main/resources/net/runelite/client/runelite.properties
+++ b/runelite-client/src/main/resources/net/runelite/client/runelite.properties
@@ -2,7 +2,9 @@ runelite.title=RuneLite
 runelite.version=${project.version}
 runescape.version=${rs.version}
 runelite.discord.appid=409416265891971072
+runelite.plus.discord.appid=560644885250572289
 runelite.discord.invite=https://discord.gg/HN5gf3m
 runelite.github.link=https://github.com/runelite-extended/runelite
 runelite.wiki.link=https://github.com/runelite-extended/runelite/wiki
-runelite.patreon.link=https://www.patreon.com/RuneLitePlus
+runelite.patreon.link=https://www.patreon.com/RuneLitePlus
+runelit.version =2.0.1-1