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

Merge branch 'master' of githubrunelite:runelite/runelite

Browse Source
This commit is contained in:
Runelite auto updater
2020-03-26 11:40:04 +00:00
parent 873a5bd5f1 beecf98d9c
commit 6021673664
5 changed files with 16 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
+3
View File
@@ -11410,5 +11410,8 @@ public final class ItemID
public static final int HELL_CAT_EARS = 24527;
public static final int LAMP_OF_THE_GATHERER = 24528;
public static final int HARMONY = 24529;
public static final int RUNNER_HAT_BROKEN = 24531;
public static final int RUNNER_HAT_L = 24533;
public static final int MITHRIL_SEEDS_24534 = 24534;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+2 -2
View File
@@ -5382,7 +5382,7 @@ public final class NpcID
public static final int MASTER_FARMER_5731 = 5731;
public static final int MARKET_GUARD_5732 = 5732;
public static final int ELNOCK_INQUISITOR = 5734;
public static final int IMPLING = 5735;
public static final int IMMENIZZ = 5735;
public static final int FAIRY_AERYKA = 5736;
public static final int WANDERING_IMPLING = 5737;
public static final int IMP_DEFENDER = 5738;
@@ -5993,7 +5993,6 @@ public final class NpcID
public static final int SISTER_SCAROPHIA = 6590;
public static final int LAVA_DRAGON = 6593;
public static final int ENT = 6594;
public static final int ENT_TRUNK = 6595;
public static final int ZOMBIE_6596 = 6596;
public static final int ZOMBIE_6597 = 6597;
public static final int ZOMBIE_6598 = 6598;
@@ -8482,5 +8481,6 @@ public final class NpcID
public static final int SLEEPWALKER_9470 = 9470;
public static final int SISTER_SENGA = 9471;
public static final int SISTER_SENGA_9472 = 9472;
public static final int ENT_TRUNK = 9474;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+1
View File
@@ -12910,5 +12910,6 @@ public final class NullItemID
public static final int NULL_24524 = 24524;
public static final int NULL_24526 = 24526;
public static final int NULL_24530 = 24530;
public static final int NULL_24532 = 24532;
/* This file is automatically generated. Do not edit. */
}
runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
+1 -1
View File
@@ -159,7 +159,7 @@ enum TeleportLocationData
EXPLORERS_RING(TeleportType.OTHER, "Explorer's Ring", new WorldPoint(3052, 3292, 0), "explorers_ring_icon.png"),
KARAMJA_GLOVES_GEM_MINE(TeleportType.OTHER, "Karamja Gloves", "Gem Mine (Underground)", new WorldPoint(2827, 2997, 0), "karamja_gloves_icon.png"),
KARAMJA_GLOVES_DURADEL(TeleportType.OTHER, "Karamja Gloves", "Duradel", new WorldPoint(2870, 2981, 0), "karamja_gloves_icon.png"),
DESERT_AMULET_NARDAH(TeleportType.OTHER, "Desert Amulet", "Nardah", new WorldPoint(3432, 2914, 0), "desert_amulet_icon.png"),
DESERT_AMULET_NARDAH(TeleportType.OTHER, "Desert Amulet", "Nardah", new WorldPoint(3425, 2928, 0), "desert_amulet_icon.png"),
DESERT_AMULKT_KALPHITE_CAVE(TeleportType.OTHER, "Desert Amulet", "Kalphite Cave", new WorldPoint(3322, 3122, 0), "desert_amulet_icon.png"),
MORYTANIA_LEGS_SLIME_PIT(TeleportType.OTHER, "Morytania Legs", "Slime Pit (Underground)", new WorldPoint(3654, 3516, 0), "morytania_legs_icon.png"),
MORYTANIA_LEGS_BURGH_DE_ROTT(TeleportType.OTHER, "Morytania Legs", "Burgh de Rott", new WorldPoint(3482, 3231, 0), "morytania_legs_icon.png"),
runelite-client/src/main/resources/item_variations.json
+9
View File
@@ -242,6 +242,10 @@
296,
297
],
"mithril seeds": [
299,
24534
],
"small fishing net": [
303,
6209
@@ -7034,6 +7038,11 @@
20507,
24173
],
"runner hat": [
10549,
24531,
24533
],
"ranger hat": [
10550,
20509,