Merge branch 'master' of https://github.com/runelite/runelite into workpls

# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
This commit is contained in:
James Munson
2019-04-24 17:27:50 -07:00
3 changed files with 45 additions and 20 deletions

View File

@@ -121,6 +121,7 @@ public class WidgetID
public static final int MINIGAME_TAB_ID = 76;
public static final int SPELLBOOK_GROUP_ID = 218;
public static final int PVP_GROUP_ID = 90;
public static final int FISHING_TRAWLER_GROUP_ID = 366;
public static final int ZEAH_MESS_HALL_GROUP_ID = 235;
public static final int KOUREND_FAVOUR_GROUP_ID = 246;
public static final int LOOTING_BAG_GROUP_ID = 81;