Merge remote-tracking branch 'runelite/master'

runelite-api/src/main/java/net/runelite/api/ParamID.java

@@ -29,6 +29,10 @@ package net.runelite.api;
  */
 public final class ParamID
 {
+	/**
+	 * Long name for NPCs used in the HP hud
+	 */
+	public static final int NPC_HP_NAME = 510;
 	/**
 	 * @see SettingID
 	 */

runelite-api/src/main/java/net/runelite/api/Varbits.java

@@ -650,7 +650,14 @@ public enum Varbits
 	 * 2 = popup notification only
 	 * 3 = chat and popup
 	 */
-	COLLECTION_LOG_NOTIFICATION(11959);
+	COLLECTION_LOG_NOTIFICATION(11959),
+
+	/**
+	 * Show boss health overlay setting
+	 * 0 = on
+	 * 1 = off
+	 */
+	BOSS_HEALTH_OVERLAY(12389);
 
 	/**
 	 * The raw varbit ID.