Merge branch 'master' of https://github.com/runelite-extended/runelite

http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java

@@ -197,7 +197,7 @@ public class RuneLiteAPI
 
 	public static String getVersion()
 	{
-		return version;
+		return upstreamVersion;
 	}
 
 	public static int getRsVersion()

runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java

@@ -3,7 +3,6 @@ package net.runelite.client.plugins.boosts;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
@@ -60,7 +59,6 @@ class CombatIconsOverlay extends Overlay
 		
 		panelComponent.getChildren().clear();
 		panelComponent.setPreferredSize(new Dimension(28, 0));
-		panelComponent.setGap(new Point(0, 18));
 		panelComponent.setWrapping(2);
 		panelComponent.setBackgroundColor(null);
 		panelComponent.setBorder(new Rectangle());

runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java

@@ -136,6 +136,7 @@ public class LineComponent implements LayoutableRenderableEntity
 		rightLineComponent.setText(right);
 		rightLineComponent.setColor(rightColor);
 		rightLineComponent.render(graphics);
+		y += metrics.getHeight();
 
 		final Dimension dimension = new Dimension(preferredSize.width, y - baseY);
 		bounds.setLocation(preferredLocation);

runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java

@@ -14,7 +14,7 @@ import org.codehaus.plexus.util.FileUtils;
 
 public class Bootstrap
 {
-	private String projectVersion = "1.5.30-SNAPSHOT";
+	private String projectVersion = "1.5.31-SNAPSHOT";
 	String buildCommit = "6fe334c02648d3f8b38625e3175e3f547d54aa37";
 	Client client = new Client();
 	String[] clientJvm9Arguments = new String[]{

runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java

@@ -32,7 +32,7 @@ public class Bootstrapper
 		}
 		else
 		{
-			remoteLocation = "/live/";
+			remoteLocation = "live/";
 			localLocation = "./live/";
 			Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
 			File dir = new File("./live/");