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

4
pom.xml
View File

@@ -28,7 +28,7 @@
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.24-SNAPSHOT</version>
<version>1.5.25-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RuneLite</name>
@@ -43,7 +43,7 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
<checkstyle.skip>true</checkstyle.skip>
<archetype.test.skip>true</archetype.test.skip>
<rs.version>179</rs.version>
<rs.version>180</rs.version>
</properties>
<licenses>