Skip to content

Commit

Permalink
Fix a dumb error where I wrote *png instead of .png breaking diffuse
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebane1 committed Jan 22, 2023
1 parent 7a1c22b commit 2369acd
Show file tree
Hide file tree
Showing 14 changed files with 11 additions and 11 deletions.
Binary file modified .vs/FFXIVLooseTextureCompiler/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file modified .vs/FFXIVLooseTextureCompiler/v17/.suo
Binary file not shown.
6 changes: 3 additions & 3 deletions FFXIVLooseTextureCompiler/FFXIVLooseTextureCompiler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyVersion>0.0.1.1</AssemblyVersion>
<FileVersion>0.0.1.1</FileVersion>
<Version>0.0.1.1</Version>
<AssemblyVersion>0.0.1.2</AssemblyVersion>
<FileVersion>0.0.1.2</FileVersion>
<Version>0.0.1.2</Version>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<Title>FFXIV Loose Texture Compiler</Title>
<Copyright>Lawener Industries</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion FFXIVLooseTextureCompiler/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private void generateButton_Click(object sender, EventArgs e) {
if (!string.IsNullOrEmpty(materialSet.Diffuse) && !string.IsNullOrEmpty(materialSet.InternalDiffusePath)) {

byte[] diffuseData = new byte[0];
if (materialSet.Diffuse.EndsWith("*png")) {
if (materialSet.Diffuse.EndsWith(".png")) {
TextureImporter.PngToTex(materialSet.Diffuse, out diffuseData);
} else if (materialSet.Diffuse.EndsWith(".dds")) {
var scratch = ScratchImage.LoadDDS(materialSet.Diffuse);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"projects": {
"C:\\Users\\stel9\\source\\repos\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler.csproj": {
"version": "0.0.1.1",
"version": "0.0.1.2",
"restore": {
"projectUniqueName": "C:\\Users\\stel9\\source\\repos\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler.csproj",
"projectName": "FFXIVLooseTextureCompiler",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("FFXIVLooseTextureCompiler")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyCopyrightAttribute("Lawener Industries")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.1.1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.1.1")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.1.2")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.1.2")]
[assembly: System.Reflection.AssemblyProductAttribute("FFXIVLooseTextureCompiler")]
[assembly: System.Reflection.AssemblyTitleAttribute("FFXIVLooseTextureCompiler")]
[assembly: System.Reflection.AssemblyVersionAttribute("0.0.1.1")]
[assembly: System.Reflection.AssemblyVersionAttribute("0.0.1.2")]
[assembly: System.Reflection.AssemblyMetadataAttribute("RepositoryUrl", "https://github.com/Sebane1/FFXIVLooseTextureCompiler")]
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ca9cd0cb06fd700bcd22c2cd1ab9337695f5218e
2b16edc1ac8200e4292758bf30bae56fce9ba94e
Binary file not shown.
Binary file not shown.
Binary file modified FFXIVLooseTextureCompiler/obj/Release/net7.0-windows/apphost.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion FFXIVLooseTextureCompiler/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
},
"project": {
"version": "0.0.1.1",
"version": "0.0.1.2",
"restore": {
"projectUniqueName": "C:\\Users\\stel9\\source\\repos\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler.csproj",
"projectName": "FFXIVLooseTextureCompiler",
Expand Down
2 changes: 1 addition & 1 deletion FFXIVLooseTextureCompiler/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "AwrPvpFToF05VuF3HgqbvrS0w6VoxCEWrYPd3mGuNn1u5ye/pRDdw4P7Lo+dliLZ4ZVoGaYp6H0+rCkJddMaVQ==",
"dgSpecHash": "qXGA4q7qmYwuC8yoV/oCzOVmXFDS4GmLGFUtsknp92cgGHTZtOfNBlOwDosjv/xdbwdw/uRUSnALVKyVAMzPvw==",
"success": true,
"projectFilePath": "C:\\Users\\stel9\\source\\repos\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler\\FFXIVLooseTextureCompiler.csproj",
"expectedPackageFiles": [
Expand Down

0 comments on commit 2369acd

Please sign in to comment.