Merge branch 'master' into maven-plugin-upgrades

http-api/pom.xml

@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<name>Web API</name>

http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserJoin.java

@@ -34,5 +34,6 @@ import net.runelite.http.api.ws.WebsocketMessage;
 public class UserJoin extends WebsocketMessage
 {
 	private final UUID memberId;
+	private final UUID partyId;
 	private final String name;
 }