Merge remote-tracking branch 'runelite/master'

runelite-client/src/main/resources/logback.xml

@@ -24,6 +24,8 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <configuration scan="true">
+    <turboFilter class="net.runelite.client.util.DeduplicationFilter"/>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <Pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</Pattern>

runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc

@@ -3260,5 +3260,15 @@
       "z1": 1,
       "z2": 2
     }
+  ],
+  "10290": [ // Ardougne Monastery
+    {
+      "rx1": 43,
+      "ry1": 17,
+      "rx2": 49,
+      "ry2": 17,
+      "z1": 0,
+      "z2": 0
+    }
   ]
 }

runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_cooking.json

@@ -78,6 +78,12 @@
       "name": "Baked Potato",
       "xp": 15
     },
+    {
+      "level": 7,
+      "icon": 25654,
+      "name": "Guppy",
+      "xp": 12
+    },
     {
       "level": 8,
       "icon": 2048,
@@ -228,6 +234,12 @@
       "name": "Cup of tea",
       "xp": 52
     },
+    {
+      "level": 20,
+      "icon": 25660,
+      "name": "Cavefish",
+      "xp": 23
+    },
     {
       "level": 21,
       "icon": 9988,
@@ -378,6 +390,12 @@
       "name": "Choc Saturday",
       "xp": 170
     },
+    {
+      "level": 33,
+      "icon": 25666,
+      "name": "Tetra",
+      "xp": 31
+    },
     {
       "level": 34,
       "icon": 7178,
@@ -516,6 +534,12 @@
       "name": "Fried Mushrooms",
       "xp": 60
     },
+    {
+      "level": 46,
+      "icon": 25672,
+      "name": "Catfish",
+      "xp": 43
+    },
     {
       "level": 47,
       "icon": 7188,

runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fishing.json

@@ -24,6 +24,12 @@
       "name": "Raw Karambwanji",
       "xp": 5
     },
+    {
+      "level": 7,
+      "icon": 25652,
+      "name": "Raw Guppy",
+      "xp": 8
+    },
     {
       "level": 10,
       "icon": 345,
@@ -48,6 +54,12 @@
       "name": "Raw Trout",
       "xp": 50
     },
+    {
+      "level": 20,
+      "icon": 25658,
+      "name": "Raw Cavefish",
+      "xp": 16
+    },
     {
       "level": 23,
       "icon": 341,
@@ -72,6 +84,12 @@
       "name": "Raw Salmon",
       "xp": 70
     },
+    {
+      "level": 33,
+      "icon": 25664,
+      "name": "Raw Tetra",
+      "xp": 24
+    },
     {
       "level": 35,
       "icon": 359,
@@ -102,6 +120,12 @@
       "name": "Raw Bass",
       "xp": 100
     },
+    {
+      "level": 46,
+      "icon": 25670,
+      "name": "Raw Catfish",
+      "xp": 33
+    },
     {
       "level": 48,
       "icon": 11328,

runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_mining.json

@@ -36,6 +36,18 @@
       "name": "Limestone",
       "xp": 26.5
     },
+    {
+      "level": 14,
+      "icon": 25683,
+      "name": "Barronite shards",
+      "xp": 16
+    },
+    {
+      "level": 14,
+      "icon": 25684,
+      "name": "Barronite deposit",
+      "xp": 32
+    },
     {
       "level": 15,
       "icon": 440,

runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_prayer.json

@@ -368,6 +368,30 @@
       "icon": 25419,
       "name": "Urium Remains",
       "xp": 120
+    },
+    {
+      "level": 1,
+      "icon": 25654,
+      "name": "Guppy",
+      "xp": 4
+    },
+    {
+      "level": 1,
+      "icon": 25660,
+      "name": "Cavefish",
+      "xp": 7
+    },
+    {
+      "level": 1,
+      "icon": 25666,
+      "name": "Tetra",
+      "xp": 10
+    },
+    {
+      "level": 1,
+      "icon": 25672,
+      "name": "Cavefish",
+      "xp": 16
     }
   ]
 }

runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_runecraft.json

@@ -102,6 +102,12 @@
       "name": "Mind Rune",
       "xp": 5.5
     },
+    {
+      "level": 2,
+      "icon": 25696,
+      "name": "Mind core",
+      "xp": 55
+    },
     {
       "level": 5,
       "icon": 555,
@@ -156,6 +162,12 @@
       "name": "Body Rune",
       "xp": 7.5
     },
+    {
+      "level": 20,
+      "icon": 25698,
+      "name": "Body core",
+      "xp": 75
+    },
     {
       "level": 23,
       "icon": 4699,
@@ -174,6 +186,12 @@
       "name": "Chaos Rune",
       "xp": 8.5
     },
+    {
+      "level": 35,
+      "icon": 25700,
+      "name": "Chaos core",
+      "xp": 85
+    },
     {
       "level": 40,
       "icon": 9075,

runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_smithing.json

@@ -156,6 +156,12 @@
       "name": "Bronze 2h Sword",
       "xp": 37.5
     },
+    {
+      "level": 14,
+      "icon": 25684,
+      "name": "Barronite deposits",
+      "xp": 30
+    },
     {
       "level": 15,
       "icon": 2351,