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

2021-05-21 16:06:44 +01:00
parent 20244e393c ab2454ca75
commit eaf0b6b060
40 changed files with 1111 additions and 281 deletions
--- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm
@@ -1077,7 +1077,13 @@ LABEL913:
 LABEL927:
   jump                   LABEL942
 LABEL928:
+   iload                  10                 ; The id of the messageNode of the message being built
+   sconst                 ""
+   sconst                 "addTimestamp"
+   runelite_callback
+   pop_int                                   ; pop message id
   sload                  14
+   join_string            2                  ; prepend the timestamp
   iload                  8
   iload                  9
   iconst                 10616888