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

Merge branch 'pr/21' into upstream

Browse Source
This commit is contained in:
Kyleeld
2020-02-27 12:01:37 +00:00
parent 89c8ceb530 e46995557f
commit b920e37571
7 changed files with 77 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/NpcID.java
+1
View File
@@ -8428,6 +8428,7 @@ public final class NpcID
public static final int STRONG_RONNY = 9410;
public static final int SHURA = 9413;
public static final int SHURA_9414 = 9414;
public static final int ACORN = 9415;
public static final int THE_NIGHTMARE = 9425;
public static final int THE_NIGHTMARE_9426 = 9426;
public static final int THE_NIGHTMARE_9427 = 9427;
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+1 -13
View File
@@ -13894,9 +13894,7 @@ public final class NullObjectID
public static final int NULL_29702 = 29702;
public static final int NULL_29703 = 29703;
public static final int NULL_29704 = 29704;
public static final int NULL_29707 = 29707;
public static final int NULL_29711 = 29711;
public static final int NULL_29712 = 29712;
public static final int NULL_29706 = 29706;
public static final int NULL_29713 = 29713;
public static final int NULL_29714 = 29714;
public static final int NULL_29715 = 29715;
@@ -14124,14 +14122,6 @@ public final class NullObjectID
public static final int NULL_30144 = 30144;
public static final int NULL_30156 = 30156;
public static final int NULL_30159 = 30159;
public static final int NULL_30160 = 30160;
public static final int NULL_30162 = 30162;
public static final int NULL_30163 = 30163;
public static final int NULL_30164 = 30164;
public static final int NULL_30165 = 30165;
public static final int NULL_30166 = 30166;
public static final int NULL_30167 = 30167;
public static final int NULL_30168 = 30168;
public static final int NULL_30171 = 30171;
public static final int NULL_30181 = 30181;
public static final int NULL_30182 = 30182;
@@ -14986,7 +14976,6 @@ public final class NullObjectID
public static final int NULL_31895 = 31895;
public static final int NULL_31896 = 31896;
public static final int NULL_31897 = 31897;
public static final int NULL_31899 = 31899;
public static final int NULL_31937 = 31937;
public static final int NULL_31938 = 31938;
public static final int NULL_31945 = 31945;
@@ -18359,7 +18348,6 @@ public final class NullObjectID
public static final int NULL_37980 = 37980;
public static final int NULL_37981 = 37981;
public static final int NULL_37982 = 37982;
public static final int NULL_37983 = 37983;
public static final int NULL_37984 = 37984;
public static final int NULL_37985 = 37985;
public static final int NULL_37986 = 37986;
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+4 -10
View File
@@ -15800,10 +15800,6 @@ public final class ObjectID
public static final int CARVED_REDWOOD_29681 = 29681;
public static final int CARVED_REDWOOD_29682 = 29682;
public static final int CRACK_29705 = 29705;
public static final int BANNER_29706 = 29706;
public static final int BANQUET_TABLE_29708 = 29708;
public static final int PRESENT_TABLE = 29709;
public static final int BIRTHDAY_HAT_TABLE = 29710;
public static final int NOTICEBOARD_29718 = 29718;
public static final int BALLISTA_29719 = 29719;
public static final int STAIRCASE_29720 = 29720;
@@ -16024,7 +16020,6 @@ public final class ObjectID
public static final int PAINTING_30155 = 30155;
public static final int FURNACE_30157 = 30157;
public static final int FURNACE_30158 = 30158;
public static final int PARTY_BALLOONS = 30161;
public static final int CRACK_30169 = 30169;
public static final int ROOT_30170 = 30170;
public static final int PORTAL_30172 = 30172;
@@ -18505,7 +18500,6 @@ public final class ObjectID
public static final int ATTAS_PLANT_DISPLAY = 34685;
public static final int LEATHER_SHIELDS = 34686;
public static final int BRYOPHYTA_DISPLAY = 34687;
public static final int BANNER_34688 = 34688;
public static final int BLOOMING_HESPORI_SPROUT = 34705;
public static final int SHRIVELLED_PLANT = 34706;
public static final int TWISTED_BUSH = 34712;
@@ -19541,6 +19535,7 @@ public final class ObjectID
public static final int NIGHTMARE_DISPLAY = 37629;
public static final int NIGHTMARE_TOPIARY = 37630;
public static final int SUPPLIES_37631 = 37631;
public static final int BANNER_37726 = 37726;
public static final int ENERGY_BARRIER_37730 = 37730;
public static final int ENERGY_BARRIER_37731 = 37731;
public static final int SPORE = 37738;
@@ -19591,11 +19586,10 @@ public final class ObjectID
public static final int LIGHT_37958 = 37958;
public static final int LIGHT_37959 = 37959;
public static final int LIGHT_37960 = 37960;
public static final int BANNER_37961 = 37961;
public static final int BANQUET_TABLE_37968 = 37968;
public static final int PRESENT_TABLE_37969 = 37969;
public static final int BIRTHDAY_HAT_TABLE_37970 = 37970;
public static final int PARTY_BALLOONS_37974 = 37974;
public static final int PRESENT_TABLE = 37969;
public static final int BIRTHDAY_HAT_TABLE = 37970;
public static final int PARTY_BALLOONS = 37974;
public static final int TABLE_37976 = 37976;
/* This file is automatically generated. Do not edit. */
}