Merge remote-tracking branch 'upstream/master' into master

2021-05-08 03:39:10 +01:00
parent c3cdd6bf2c 7092c0a29d
commit c1c17ebda6
36 changed files with 461 additions and 85 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json
@@ -210,6 +210,12 @@
      "name": "Willow Longbow",
      "xp": 41.5
    },
+    {
+      "level": 40,
+      "icon": 1391,
+      "name": "Battlestaff",
+      "xp": 80
+    },
    {
      "level": 41,
      "icon": 880,
--- 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,7 @@ runelite.title=OpenOSRS
 runelite.version=@project.version@
 runescape.version=@rs.version@
 runelite.discord.appid=627741263881568257
-runelite.discord.invite=https://discord.gg/openosrs
+runelite.discord.invite=https://discord.gg/r287wN6bkc
 runelite.github.link=https://github.com/open-osrs
 runelite.wiki.link=https://github.com/open-osrs/runelite/wiki
 runelite.patreon.link=https://www.patreon.com/openosrs