diff --git a/.gitignore b/.gitignore
index a11f506..f635fe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
##
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+examples/tests/32x32/
+
# User-specific files
*.rsuser
*.suo
diff --git a/McBitFont/FodyWeavers.xml b/McBitFont/FodyWeavers.xml
new file mode 100644
index 0000000..5029e70
--- /dev/null
+++ b/McBitFont/FodyWeavers.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/McBitFont/Form1.Designer.cs b/McBitFont/Form1.Designer.cs
index 9a10dc0..fe4a614 100644
--- a/McBitFont/Form1.Designer.cs
+++ b/McBitFont/Form1.Designer.cs
@@ -53,6 +53,7 @@
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.openDEVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveDEVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -81,7 +82,6 @@
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.chkLeftSide = new System.Windows.Forms.CheckBox();
this.chkTopSide = new System.Windows.Forms.CheckBox();
- this.openDEVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.nudX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudY)).BeginInit();
this.panel1.SuspendLayout();
@@ -459,6 +459,14 @@
this.openToolStripMenuItem.Text = "Open";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
+ // openDEVToolStripMenuItem
+ //
+ this.openDEVToolStripMenuItem.Name = "openDEVToolStripMenuItem";
+ this.openDEVToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.openDEVToolStripMenuItem.Text = "Open DEV";
+ this.openDEVToolStripMenuItem.Visible = false;
+ this.openDEVToolStripMenuItem.Click += new System.EventHandler(this.openDEVToolStripMenuItem_Click);
+ //
// saveDEVToolStripMenuItem
//
this.saveDEVToolStripMenuItem.Name = "saveDEVToolStripMenuItem";
@@ -716,6 +724,7 @@
//
// chkLeftSide
//
+ this.chkLeftSide.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkLeftSide.AutoSize = true;
this.chkLeftSide.Location = new System.Drawing.Point(712, 29);
this.chkLeftSide.Name = "chkLeftSide";
@@ -727,6 +736,7 @@
//
// chkTopSide
//
+ this.chkTopSide.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkTopSide.AutoSize = true;
this.chkTopSide.Location = new System.Drawing.Point(712, 50);
this.chkTopSide.Name = "chkTopSide";
@@ -736,14 +746,6 @@
this.toolTip1.SetToolTip(this.chkTopSide, "Height changes will be made on Top/Bottom side");
this.chkTopSide.UseVisualStyleBackColor = true;
//
- // openDEVToolStripMenuItem
- //
- this.openDEVToolStripMenuItem.Name = "openDEVToolStripMenuItem";
- this.openDEVToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
- this.openDEVToolStripMenuItem.Text = "Open DEV";
- this.openDEVToolStripMenuItem.Visible = false;
- this.openDEVToolStripMenuItem.Click += new System.EventHandler(this.openDEVToolStripMenuItem_Click);
- //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/McBitFont/Form1.cs b/McBitFont/Form1.cs
index 4bc2635..aff2b4e 100644
--- a/McBitFont/Form1.cs
+++ b/McBitFont/Form1.cs
@@ -64,7 +64,7 @@ namespace McBitFont {
public bool monospaced = false;
bool modified = false;
bool prjModified = false;
- public const string version = "1.7";
+ public const string version = "1.7a";
public string prjName = "Untitled";
public string prjFileName = "";
public int codepage = 1251;
diff --git a/McBitFont/Form1.resx b/McBitFont/Form1.resx
index 398ee74..840ae1f 100644
--- a/McBitFont/Form1.resx
+++ b/McBitFont/Form1.resx
@@ -132,9 +132,6 @@
336, 17
-
- 436, 17
-
diff --git a/McBitFont/McBitFont.csproj b/McBitFont/McBitFont.csproj
index 8d5ff44..3bb5f94 100644
--- a/McBitFont/McBitFont.csproj
+++ b/McBitFont/McBitFont.csproj
@@ -1,5 +1,6 @@
+
Debug
@@ -12,6 +13,9 @@
512
true
true
+ false
+
+
publish\
true
Disk
@@ -23,12 +27,10 @@
false
true
0
- 1.0.0.%2a
- false
+ 1.7.0.0
false
+ true
true
-
-
AnyCPU
@@ -42,17 +44,34 @@
AnyCPU
- pdbonly
+ embedded
true
bin\Release\
TRACE
prompt
4
+ false
+ true
icon_64.ico
+
+ 0A7368787FA9EE4B7327F4CB5CD09A2A4CBF3168
+
+
+ McBitFont_TemporaryKey.pfx
+
+
+ true
+
+
+ true
+
+
+ ..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll
+
..\packages\MessagePack.3.1.3\lib\net472\MessagePack.dll
@@ -145,6 +164,7 @@
Resources.resx
True
+
SettingsSingleFileGenerator
@@ -229,7 +249,7 @@
False
- Microsoft .NET Framework 4.7.2 %28x86 и x64%29
+ Microsoft .NET Framework 4.7.2 %28x86 and x64%29
true
@@ -245,5 +265,10 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
\ No newline at end of file
diff --git a/McBitFont/packages.config b/McBitFont/packages.config
index bb9683a..a06c9d4 100644
--- a/McBitFont/packages.config
+++ b/McBitFont/packages.config
@@ -1,5 +1,7 @@
+
+