diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 0fe0f533..cfc73b69 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -56,6 +56,7 @@ namespace PckStudio
imageList.Images.Add(Resources.CAPE_ICON); // Icon for Cape files (*.png)
imageList.Images.Add(Resources.TEXTURE_ICON); // Icon for Texture files (*.png;*.tga)
imageList.Images.Add(Resources.BEHAVIOURS_ICON); // Icon for Behaviour files (behaviours.bin)
+ imageList.Images.Add(Resources.ENTITY_MATERIALS_ICON); // Icon for Entity Material files (entityMaterials.bin)
pckOpen.AllowDrop = true;
isSelectingTab = true;
@@ -1979,6 +1980,10 @@ namespace PckStudio
node.ImageIndex = 15;
node.SelectedImageIndex = 15;
break;
+ case PCKFile.FileData.FileType.MaterialFile:
+ node.ImageIndex = 16;
+ node.SelectedImageIndex = 16;
+ break;
default: // unknown file format
node.ImageIndex = 5;
node.SelectedImageIndex = 5;
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index ddd211c8..1f4ac3f3 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -701,6 +701,7 @@
+
diff --git a/PCK-Studio/Properties/Resources.Designer.cs b/PCK-Studio/Properties/Resources.Designer.cs
index 3e1b6081..dd03e45c 100644
--- a/PCK-Studio/Properties/Resources.Designer.cs
+++ b/PCK-Studio/Properties/Resources.Designer.cs
@@ -161,17 +161,22 @@ namespace PckStudio.Properties {
}
///
- /// Looks up a localized string similar to 7.0 (BETA)
+ /// Looks up a localized string similar to 7.01 (BETA)
+ ///==========
+ ///Some features may be completely missing or incomplete at this point in time!
+ ///
+ ///-Added .3dst (3DS Texture) support
+ ///-Semi-added Sub-Pck editing
+ ///-Add an edit all properties tool item
+ ///-Skin Preview has been improved
+ ///-Added Pack Icon Injection into .arc file
+ ///-Improved COL Editor
+ ///
+ ///7.0 (BETA)
///==========
///Some features may be completely missing or incomplete at this point in time!
///
- ///-Massive codebase overhaul and optimization lead by miku-666 (aka NessieHax)!!!
- ///-Some UI redesigned by yaboiFoxx
- ///-Improved the changelog!
- ///-New icons for each of the file types, with unique image icons for skin, texture, and cape files
- ///-Added the ability to create Texture and Mash-Up packs
- ///-Added a feature to see stats about any given file, including file type
- ///-Added a feature set [rest of string was truncated]";.
+ ///-Massive codebase overhaul and optimization lead by miku-666 (aka NessieHax)!!! [rest of string was truncated]";.
///
public static string CHANGELOG {
get {
@@ -249,6 +254,16 @@ namespace PckStudio.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap ENTITY_MATERIALS_ICON {
+ get {
+ object obj = ResourceManager.GetObject("ENTITY_MATERIALS_ICON", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/PCK-Studio/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx
index 2ea9e95f..361c9c39 100644
--- a/PCK-Studio/Properties/Resources.resx
+++ b/PCK-Studio/Properties/Resources.resx
@@ -322,4 +322,7 @@
..\Resources\TexturePackIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\iconImageList\ENTITY MATERIALS ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/PCK-Studio/Resources/iconImageList/ENTITY MATERIALS ICON.png b/PCK-Studio/Resources/iconImageList/ENTITY MATERIALS ICON.png
new file mode 100644
index 00000000..9b390b47
Binary files /dev/null and b/PCK-Studio/Resources/iconImageList/ENTITY MATERIALS ICON.png differ