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

2019-07-14 23:34:37 +02:00
parent 935037cd98 477b0977dc
commit 6be342115c
18 changed files with 64153 additions and 146 deletions
--- a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java
@@ -82,9 +82,9 @@ public class ProjectileID
 	public static final int CERB_FIRE = 1247;

 	/**
-	 * missing: marble gargoyle, superior dark beast
+	 * missing: superior dark beast
 	 */
-
+	public static final int MARBLE_GARGOYLE_AOE = 1453;
 	/**
 	 * non AOE, regular projectiles
 	 */