Merge remote-tracking branch 'runelite/master'

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

@@ -4720,7 +4720,6 @@
   ],
   "cyan crystal": [
     6643,
-    22366,
     23779
   ],
   "blue crystal": [
@@ -8292,10 +8291,6 @@
     24890,
     24894
   ],
-  "dark altar": [
-    20619,
-    22778
-  ],
   "occult altar": [
     20620,
     20621,
@@ -9306,10 +9301,6 @@
     24365,
     24366
   ],
-  "twisted adamant trophy": [
-    24376,
-    25046
-  ],
   "twisted hat": [
     24387,
     24397,

runelite-client/src/main/resources/scripts/ChatBuilder.rs2asm

@@ -533,7 +533,13 @@ LABEL416:
 LABEL430:
    jump                   LABEL445
 LABEL431:
+   iload                  9                 ; The id of the messageNode of the message being built
+   sconst                 ""
+   sconst                 "addTimestamp"
+   runelite_callback
+   pop_int               ; pop message id
    sload                  11
+   join_string            2
    iload                  7
    iload                  8
    iconst                 10616891