Merge remote-tracking branch 'runelite/master'

2020-11-18 23:00:48 +01:00
parent d28b2e5047 ea024ee756
commit b229e730ce
10 changed files with 88 additions and 31 deletions
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -3336,7 +3336,6 @@
  ],
  "monkey": [
    4033,
-    7503,
    8942,
    19556
  ],
@@ -4107,10 +4106,6 @@
    5050,
    5052
  ],
-  "dwarf": [
-    5054,
-    7500
-  ],
  "dwarven battleaxe": [
    5056,
    5057,
--- a/runelite-client/src/main/resources/scripts/FriendsChatSendKick.rs2asm
+++ b/runelite-client/src/main/resources/scripts/FriendsChatSendKick.rs2asm
@@ -1,4 +1,4 @@
-.id                 215
+.id                 3764
 .int_stack_count    0
 .string_stack_count 1
 .int_var_count      0