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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2019-11-07 20:52:53 +01:00
parent dfd4686156 16aba589fd
commit 514bcdf93b
8 changed files with 269 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+9
View File
@@ -11318,5 +11318,14 @@ public final class ItemID
public static final int SKELETON_LANTERN = 24327;
public static final int BOUNTY_CRATE = 24329;
public static final int BIRTHDAY_CAKE_24331 = 24331;
public static final int BIRTHDAY_CAKE_24332 = 24332;
public static final int DAGONHAI_ROBES_SET = 24333;
public static final int BOUNTY_TARGET_TELEPORT = 24336;
public static final int BOUNTY_HUNTER_HAT_TIER_1 = 24338;
public static final int BOUNTY_HUNTER_HAT_TIER_2 = 24340;
public static final int BOUNTY_HUNTER_HAT_TIER_3 = 24342;
public static final int BOUNTY_HUNTER_HAT_TIER_4 = 24344;
public static final int BOUNTY_HUNTER_HAT_TIER_5 = 24346;
public static final int BOUNTY_HUNTER_HAT_TIER_6 = 24348;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+2 -8
View File
@@ -286,7 +286,7 @@ public final class NpcID
public static final int DWARF = 290;
public static final int CHAOS_DWARF = 291;
public static final int DWARF_292 = 292;
public static final int SNAILNECK = 293;
public static final int ADVENTURER_JON = 293;
public static final int DWARF_294 = 294;
public static final int DWARF_295 = 295;
public static final int DWARF_296 = 296;
@@ -308,7 +308,6 @@ public final class NpcID
public static final int FROG = 312;
public static final int REACHER_313 = 313;
public static final int DR_JEKYLL_314 = 314;
public static final int GRASSLEGS = 315;
public static final int PAUL = 317;
public static final int DARK_CORE = 318;
public static final int CORPOREAL_BEAST = 319;
@@ -7161,8 +7160,6 @@ public final class NpcID
public static final int REVENANT_DARK_BEAST = 7938;
public static final int REVENANT_KNIGHT = 7939;
public static final int REVENANT_DRAGON = 7940;
public static final int EPIC_MAGER34 = 7941;
public static final int EPIC_MAGER34_7942 = 7942;
public static final int EMBLEM_TRADER_7943 = 7943;
public static final int FISHING_SPOT_7946 = 7946;
public static final int FISHING_SPOT_7947 = 7947;
@@ -8267,7 +8264,7 @@ public final class NpcID
public static final int ED_9200 = 9200;
public static final int CRAB_9201 = 9201;
public static final int TIDE = 9202;
public static final int ADVENTURER_JON = 9244;
public static final int ADVENTURER_JON_9244 = 9244;
public static final int ARIANWYN_HARD = 9246;
public static final int ESSYLLT_HARD = 9247;
public static final int ARIANWYN_9248 = 9248;
@@ -8319,8 +8316,5 @@ public final class NpcID
public static final int TYPHOR_9296 = 9296;
public static final int VRITRA = 9297;
public static final int MAZ = 9298;
public static final int MAD_MELVIN96 = 9299;
public static final int GOBLIN_9300 = 9300;
public static final int BUTTERFLY_9301 = 9301;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+9 -1
View File
@@ -12805,6 +12805,14 @@ public final class NullItemID
public static final int NULL_24326 = 24326;
public static final int NULL_24328 = 24328;
public static final int NULL_24330 = 24330;
public static final int NULL_24332 = 24332;
public static final int NULL_24334 = 24334;
public static final int NULL_24335 = 24335;
public static final int NULL_24337 = 24337;
public static final int NULL_24339 = 24339;
public static final int NULL_24341 = 24341;
public static final int NULL_24343 = 24343;
public static final int NULL_24345 = 24345;
public static final int NULL_24347 = 24347;
public static final int NULL_24349 = 24349;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+3 -7
View File
@@ -18038,15 +18038,13 @@ public final class NullObjectID
public static final int NULL_37430 = 37430;
public static final int NULL_37432 = 37432;
public static final int NULL_37433 = 37433;
public static final int NULL_37439 = 37439;
public static final int NULL_37441 = 37441;
public static final int NULL_37442 = 37442;
public static final int NULL_37443 = 37443;
public static final int NULL_37436 = 37436;
public static final int NULL_37437 = 37437;
public static final int NULL_37438 = 37438;
public static final int NULL_37446 = 37446;
public static final int NULL_37447 = 37447;
public static final int NULL_37448 = 37448;
public static final int NULL_37449 = 37449;
public static final int NULL_37450 = 37450;
public static final int NULL_37451 = 37451;
public static final int NULL_37452 = 37452;
public static final int NULL_37453 = 37453;
@@ -18054,7 +18052,5 @@ public final class NullObjectID
public static final int NULL_37455 = 37455;
public static final int NULL_37456 = 37456;
public static final int NULL_37457 = 37457;
public static final int NULL_37458 = 37458;
public static final int NULL_37460 = 37460;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
-5
View File
@@ -19385,12 +19385,7 @@ public final class ObjectID
public static final int ROUGH_WALL_37431 = 37431;
public static final int STREAK_INFO = 37434;
public static final int SWAMPY_SINK = 37435;
public static final int BED_37436 = 37436;
public static final int BED_37437 = 37437;
public static final int BLACK_POWDER = 37438;
public static final int SMOKE_BOMB = 37440;
public static final int LOG_PILE_37444 = 37444;
public static final int HOTSPOT_MARKER = 37445;
public static final int FOUNTAIN_37459 = 37459;
/* This file is automatically generated. Do not edit. */
}