From bdb1aaaab505f34cd345f4d00f4349d8a0f3784d Mon Sep 17 00:00:00 2001 From: SlawekNowy <38943477+SlawekNowy@users.noreply.github.com> Date: Fri, 7 Jul 2023 20:50:49 +0200 Subject: [PATCH 1/2] Fix-up projects for edits --- AtlasTool/AtlasTool.csproj | 2 +- ScriptTool/Main.Designer.cs | 8 +++++--- ScriptTool/ScriptTool.csproj | 7 ++++--- ScriptTool/packages.config | 4 ++++ 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 ScriptTool/packages.config diff --git a/AtlasTool/AtlasTool.csproj b/AtlasTool/AtlasTool.csproj index 25ad0ff..ccede0c 100644 --- a/AtlasTool/AtlasTool.csproj +++ b/AtlasTool/AtlasTool.csproj @@ -35,7 +35,7 @@ - ..\..\Dead Cells\steamapps\common\Dead Cells\ModTools\Common.dll + ..\Build\Common.dll diff --git a/ScriptTool/Main.Designer.cs b/ScriptTool/Main.Designer.cs index 154474f..6a71edd 100644 --- a/ScriptTool/Main.Designer.cs +++ b/ScriptTool/Main.Designer.cs @@ -81,13 +81,15 @@ private void InitializeComponent() this.fileToolStripMenuItem.Size = new global::System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.ShortcutKeys = (global::System.Windows.Forms.Keys)131150; + //this.newToolStripMenuItem.ShortcutKeys = (global::System.Windows.Forms.Keys)131150; + this.newToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N; this.newToolStripMenuItem.Size = new global::System.Drawing.Size(146, 22); this.newToolStripMenuItem.Text = "New"; this.newToolStripMenuItem.Click += new global::System.EventHandler(this.newToolStripMenuItem_Click); this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.ShortcutKeys = (global::System.Windows.Forms.Keys)131151; - this.openToolStripMenuItem.Size = new global::System.Drawing.Size(146, 22); + //this.openToolStripMenuItem.ShortcutKeys = (global::System.Windows.Forms.Keys)131151; + this.newToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O; + this.openToolStripMenuItem.Size = new global::System.Drawing.Size(146, 22); this.openToolStripMenuItem.Text = "Open"; this.openToolStripMenuItem.Click += new global::System.EventHandler(this.openToolStripMenuItem_Click); this.quitToolStripMenuItem.Name = "quitToolStripMenuItem"; diff --git a/ScriptTool/ScriptTool.csproj b/ScriptTool/ScriptTool.csproj index 037439f..1c68d90 100644 --- a/ScriptTool/ScriptTool.csproj +++ b/ScriptTool/ScriptTool.csproj @@ -35,10 +35,10 @@ - ..\..\Dead Cells\steamapps\common\Dead Cells\ModTools\Common.dll + ..\Build\Common.dll - - ..\..\Dead Cells\steamapps\common\Dead Cells\ModTools\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -93,6 +93,7 @@ + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/ScriptTool/packages.config b/ScriptTool/packages.config new file mode 100644 index 0000000..0b14af3 --- /dev/null +++ b/ScriptTool/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From 278924aa26a4324dbaac1840f819f0ad238b7c6d Mon Sep 17 00:00:00 2001 From: SlawekNowy <38943477+SlawekNowy@users.noreply.github.com> Date: Fri, 7 Jul 2023 21:06:24 +0200 Subject: [PATCH 2/2] Whoopsie --- ScriptTool/Main.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ScriptTool/Main.Designer.cs b/ScriptTool/Main.Designer.cs index 6a71edd..9536c3e 100644 --- a/ScriptTool/Main.Designer.cs +++ b/ScriptTool/Main.Designer.cs @@ -88,7 +88,7 @@ private void InitializeComponent() this.newToolStripMenuItem.Click += new global::System.EventHandler(this.newToolStripMenuItem_Click); this.openToolStripMenuItem.Name = "openToolStripMenuItem"; //this.openToolStripMenuItem.ShortcutKeys = (global::System.Windows.Forms.Keys)131151; - this.newToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O; + this.openToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O; this.openToolStripMenuItem.Size = new global::System.Drawing.Size(146, 22); this.openToolStripMenuItem.Text = "Open"; this.openToolStripMenuItem.Click += new global::System.EventHandler(this.openToolStripMenuItem_Click);