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

Merge remote-tracking branch 'orig_upstream/master' into master2

Browse Source 
# Conflicts:
#	pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
This commit is contained in:
Lucas
2019-05-23 14:03:13 +02:00
parent 8606c12fd3 46f5a51477
commit 1a2be0c2b5
25 changed files with 543 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/pom.xml
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>
@@ -193,12 +193,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>
@@ -338,12 +332,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>