diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index d80dc62c..fb0d51b7 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -105,7 +105,7 @@
true
- Resources\PCK-Studio_Logo.ico
+ ../ProjectLogo.ico
false
@@ -139,6 +139,7 @@
+
Properties\app.manifest
@@ -740,7 +741,6 @@
-
@@ -750,7 +750,7 @@
all
- 1.1.3.18
+ 1.1.4.20
1.2.0.3
diff --git a/PCK-Studio/Properties/Resources.Designer.cs b/PCK-Studio/Properties/Resources.Designer.cs
index 2ed0eb44..88909123 100644
--- a/PCK-Studio/Properties/Resources.Designer.cs
+++ b/PCK-Studio/Properties/Resources.Designer.cs
@@ -504,6 +504,16 @@ namespace PckStudio.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ ///
+ public static System.Drawing.Icon ProjectLogo {
+ get {
+ object obj = ResourceManager.GetObject("ProjectLogo", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -609,18 +619,28 @@ namespace PckStudio.Properties {
/// "COMMENT_1": "Tile data research by MattNL",
/// "COMMENT_2": "JSON conversion by PhoenixARC",
/// "blocks": [
- /// { "grass_top": "Grass Block (Top)" },
- /// { "stone": "Stone" },
- /// { "dirt": "Dirt" },
- /// { "grass_side": "Grass Block (Side)" },
- /// { "planks_oak": "Oak Planks" },
- /// { "stoneslab_side": "Stone Slab (Side)" },
- /// { "stoneslab_top": "Stone Slab (Top)" },
- /// { "brick": "Bricks" },
- /// { "tnt_side": "TNT (Side)" },
- /// { "tnt_top": "TNT (Top)" },
- /// { "tnt_bottom": "TNT (Bottom)" },
- /// { "web": "Cobw [rest of string was truncated]";.
+ /// {
+ /// "internalName": "grass_top",
+ /// "displayName": "Grass Block (Top)"
+ /// },
+ /// {
+ /// "internalName": "stone",
+ /// "displayName": "Stone"
+ /// },
+ /// {
+ /// "internalName": "dirt",
+ /// "displayName": "Dirt"
+ /// },
+ /// {
+ /// "internalName": "grass_side",
+ /// "displayName": "Grass Block (Side)"
+ /// },
+ /// {
+ /// "internalName": "planks_oak",
+ /// "displayName": "Oak Planks"
+ /// },
+ /// {
+ /// "internalName": [rest of string was truncated]";.
///
public static string tileData {
get {
diff --git a/PCK-Studio/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx
index cd97661f..58f5451c 100644
--- a/PCK-Studio/Properties/Resources.resx
+++ b/PCK-Studio/Properties/Resources.resx
@@ -325,4 +325,7 @@
..\Resources\icons\ranch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\..\ProjectLogo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/PCK-Studio/Resources/PCK-Studio_Logo.ico b/PCK-Studio/Resources/PCK-Studio_Logo.ico
deleted file mode 100644
index 85357f6f..00000000
Binary files a/PCK-Studio/Resources/PCK-Studio_Logo.ico and /dev/null differ
diff --git a/PCK-Studio/Resources/favicon (6).ico b/PCK-Studio/Resources/favicon (6).ico
deleted file mode 100644
index 59fd4f27..00000000
Binary files a/PCK-Studio/Resources/favicon (6).ico and /dev/null differ
diff --git a/Icon.ico b/ProjectLogo.ico
similarity index 100%
rename from Icon.ico
rename to ProjectLogo.ico
diff --git a/Logo.png b/ProjectLogo.png
similarity index 100%
rename from Logo.png
rename to ProjectLogo.png