Merge branch 'pr/2' into upstream

2020-03-27 15:00:13 +00:00
parent 146ab3beff 18a9a60b7d
commit b49c9d8b69
4 changed files with 15 additions and 2 deletions
@@ -11412,5 +11412,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. */
 }
@@ -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. */
 }
@@ -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. */
 }