From d9ccc2d89bed6bb42f0d981ca258c126f5654be1 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Sun, 22 Aug 2021 21:50:28 -0400
Subject: [PATCH 1/2] Add missing event keywords

---
 Dalamud/Game/Gui/GameGui.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dalamud/Game/Gui/GameGui.cs b/Dalamud/Game/Gui/GameGui.cs
index 6603dd911..06e5eeaba 100644
--- a/Dalamud/Game/Gui/GameGui.cs
+++ b/Dalamud/Game/Gui/GameGui.cs
@@ -125,6 +125,16 @@ namespace Dalamud.Game.Gui
         /// </summary>
         public event EventHandler<bool> OnUiHideToggled;
 
+        /// <summary>
+        /// Event that is fired when the currently hovered item changes.
+        /// </summary>
+        public event EventHandler<ulong> HoveredItemChanged;
+
+        /// <summary>
+        /// Event that is fired when the currently hovered action changes.
+        /// </summary>
+        public event EventHandler<HoveredAction> HoveredActionChanged;
+
         /// <summary>
         /// Gets a value indicating whether the game UI is hidden.
         /// </summary>
@@ -141,16 +151,6 @@ namespace Dalamud.Game.Gui
         /// </summary>
         public HoveredAction HoveredAction { get; } = new HoveredAction();
 
-        /// <summary>
-        /// Gets or sets the event that is fired when the currently hovered item changes.
-        /// </summary>
-        public EventHandler<ulong> HoveredItemChanged { get; set; }
-
-        /// <summary>
-        /// Gets or sets the event that is fired when the currently hovered action changes.
-        /// </summary>
-        public EventHandler<HoveredAction> HoveredActionChanged { get; set; }
-
         /// <summary>
         /// Opens the in-game map with a flag on the location of the parameter.
         /// </summary>

From 122a84df47875854f3cc222eee9b07460b8ae11c Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Sun, 22 Aug 2021 19:39:11 -0400
Subject: [PATCH 2/2] Reload plugin manifest on dev plugin reload

---
 Dalamud/Plugin/Internal/LocalPlugin.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Dalamud/Plugin/Internal/LocalPlugin.cs b/Dalamud/Plugin/Internal/LocalPlugin.cs
index 1bbebb1d7..bf3033794 100644
--- a/Dalamud/Plugin/Internal/LocalPlugin.cs
+++ b/Dalamud/Plugin/Internal/LocalPlugin.cs
@@ -139,7 +139,7 @@ namespace Dalamud.Plugin.Internal
         /// <summary>
         /// Gets the plugin manifest, if one exists.
         /// </summary>
-        public LocalPluginManifest Manifest { get; }
+        public LocalPluginManifest Manifest { get; private set; }
 
         /// <summary>
         /// Gets or sets the current state of the plugin.
@@ -242,6 +242,14 @@ namespace Dalamud.Plugin.Internal
                 if (reloading)
                 {
                     this.loader.Reload();
+
+                    // Reload the manifest in-case there were changes here too.
+                    if (this.IsDev)
+                    {
+                        var manifestFile = LocalPluginManifest.GetManifestFile(this.DllFile);
+                        if (manifestFile.Exists)
+                            this.Manifest = LocalPluginManifest.Load(manifestFile);
+                    }
                 }
 
                 // Load the assembly