ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
PKLite
2019-08-01 16:19:33 -04:00
parent 632c977a3f 06b1f9b412
commit f1dc3640af
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
View File

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

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

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

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

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

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

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

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

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