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
2020-06-12 11:47:22 +02:00
parent ae9de3928f 4b806d532f
commit bf62332a7c
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+1
View File
@@ -11571,5 +11571,6 @@ public final class ItemID
public static final int VYRE_NOBLE_DRESS_TOP_24838 = 24838; public static final int VYRE_NOBLE_DRESS_TOP_24838 = 24838;
public static final int VYRE_NOBLE_DRESS_BOTTOM_24840 = 24840; public static final int VYRE_NOBLE_DRESS_BOTTOM_24840 = 24840;
public static final int A_TASTE_OF_HOPE = 24842; public static final int A_TASTE_OF_HOPE = 24842;
public static final int RING_OF_ENDURANCE_UNCHARGED_24844 = 24844;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+2
View File
@@ -13064,5 +13064,7 @@ public final class NullItemID
public static final int NULL_24839 = 24839; public static final int NULL_24839 = 24839;
public static final int NULL_24841 = 24841; public static final int NULL_24841 = 24841;
public static final int NULL_24843 = 24843; public static final int NULL_24843 = 24843;
public static final int NULL_24845 = 24845;
public static final int NULL_24846 = 24846;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+2 -1
View File
@@ -19453,7 +19453,6 @@ public final class NullObjectID
public static final int NULL_39532 = 39532; public static final int NULL_39532 = 39532;
public static final int NULL_39533 = 39533; public static final int NULL_39533 = 39533;
public static final int NULL_39534 = 39534; public static final int NULL_39534 = 39534;
public static final int NULL_39535 = 39535;
public static final int NULL_39536 = 39536; public static final int NULL_39536 = 39536;
public static final int NULL_39537 = 39537; public static final int NULL_39537 = 39537;
public static final int NULL_39538 = 39538; public static final int NULL_39538 = 39538;
@@ -19462,5 +19461,7 @@ public final class NullObjectID
public static final int NULL_39541 = 39541; public static final int NULL_39541 = 39541;
public static final int NULL_39542 = 39542; public static final int NULL_39542 = 39542;
public static final int NULL_39543 = 39543; public static final int NULL_39543 = 39543;
public static final int NULL_39544 = 39544;
public static final int NULL_39545 = 39545;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/ObjectID.java
-1
View File
@@ -19728,7 +19728,6 @@ public final class ObjectID
public static final int WIZARD_STATUE_38423 = 38423; public static final int WIZARD_STATUE_38423 = 38423;
public static final int WIZARD_STATUE_38424 = 38424; public static final int WIZARD_STATUE_38424 = 38424;
public static final int WIZARD_STATUE_38425 = 38425; public static final int WIZARD_STATUE_38425 = 38425;
public static final int FIRE_38426 = 38426;
public static final int FIRE_38427 = 38427; public static final int FIRE_38427 = 38427;
public static final int KNIGHT_STATUE = 38428; public static final int KNIGHT_STATUE = 38428;
public static final int KNIGHT_STATUE_38429 = 38429; public static final int KNIGHT_STATUE_38429 = 38429;
runelite-client/src/main/resources/item_variations.json
+2 -1
View File
@@ -9812,7 +9812,8 @@
], ],
"ring of endurance": [ "ring of endurance": [
24735, 24735,
24736 24736,
24844
], ],
"strange old lockpick": [ "strange old lockpick": [
24738, 24738,