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

runelite-client/src/main/resources/item_variations.json

@@ -3323,11 +3323,14 @@
     7104,
     7105,
     7106,
-    7107
+    7107,
+    25708
   ],
   "stool": [
     3893,
-    5732
+    5732,
+    25710,
+    25711
   ],
   "wilderness sword": [
     3981,
@@ -9770,5 +9773,25 @@
   "ornate lockbox": [
     25650,
     25651
+  ],
+  "clan cloak": [
+    25712,
+    25714,
+    25715,
+    25716,
+    25717,
+    25718,
+    25719,
+    25720
+  ],
+  "clan vexillum": [
+    25721,
+    25723,
+    25724,
+    25725,
+    25726,
+    25727,
+    25728,
+    25729
   ]
 }

runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl

@@ -25,7 +25,7 @@
 #version 330
 
 uniform sampler2DArray textures;
-uniform vec2 textureOffsets[64];
+uniform vec2 textureOffsets[128];
 uniform float brightness;
 uniform float smoothBanding;
 uniform vec4 fogColor;