Merge remote-tracking branch 'upstream/master' into maven-plugin-upgrades

This commit is contained in:
William Collishaw
2019-05-26 14:52:16 -06:00
75 changed files with 1930 additions and 899 deletions

View File

@@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.24-SNAPSHOT</version>
<version>1.5.25-SNAPSHOT</version>
</parent>
<artifactId>client</artifactId>
@@ -197,12 +197,6 @@
<artifactId>runelite-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.runelite.rs</groupId>
<artifactId>runescape-api</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.runelite</groupId>
<artifactId>client-patch</artifactId>
@@ -309,12 +303,6 @@
<include>**</include>
</includes>
</filter>
<filter>
<artifact>net.runelite.rs:runescape-api</artifact>
<includes>
<include>**</include>
</includes>
</filter>
<filter>
<artifact>net.runelite.pushingpixels:*</artifact>
<includes>