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

Nice insider info btw, be nice if you shared it, so-called "open source" client.

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

@@ -65,7 +65,6 @@ public class RuneLiteAPI
 
 	private static final Properties properties = new Properties();
 	private static String version;
-	private static int rsVersion;
 
 	static
 	{
@@ -75,7 +74,6 @@ public class RuneLiteAPI
 			properties.load(in);
 
 			version = properties.getProperty("runelite.version");
-			rsVersion = Integer.parseInt(properties.getProperty("rs.version"));
 			String commit = properties.getProperty("runelite.commit");
 			boolean dirty = Boolean.parseBoolean(properties.getProperty("runelite.dirty"));
 
@@ -181,9 +179,4 @@ public class RuneLiteAPI
 		RuneLiteAPI.version = version;
 	}
 
-	public static int getRsVersion()
-	{
-		return rsVersion;
-	}
-
 }

http-api/src/main/resources/runelite.properties

@@ -1,3 +1,2 @@
 runelite.version=@projectver@
-rs.version=@rsver@
 runelite.commit=@gitcommit@