Merge pull request #39 from fosspill/development

Rebuilt framework, argument exception fix
fosspill · May 28, 2019 · 401d27d · 401d27d
2 parents 9da20a2 + 767d652
commit 401d27d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/FFXIV_TexTools_CLI/Arguments.cs b/FFXIV_TexTools_CLI/Arguments.cs
@@ -15,7 +15,6 @@ public void ArgumentHandler(string[] args)
             string helpText = $"Usage: {Path.GetFileName(Environment.GetCommandLineArgs()[0])} [action] {"{arguments}"}\n\n";
             helpText = helpText + @"Available actions:
   modpack import, mpi      Import a modpack, requires a .ttmp(2) to be specified
-  mods list, ml            List all currently installed mods
   mods enable, me          Enable all installed mods
   mods disable, md         Disable all installed mods
   mods refresh, mr         Enable/disable mods as specified in modlist.cfg
@@ -33,6 +32,11 @@ public void ArgumentHandler(string[] args)
   -C, --custom             Use a modpack's config file to selectively import mods from the pack (modpack import only)";
             string ttmpPath = "";
             bool customImport = false;
+            if (args.Length == 0)
+            {
+                main.PrintMessage(helpText);
+                return;
+            }
             foreach (string cmdArg in args)
             {
                 string nextArg = "";

diff --git a/FFXIV_TexTools_CLI/FFXIV_TexTools_CLI.csproj b/FFXIV_TexTools_CLI/FFXIV_TexTools_CLI.csproj
@@ -31,7 +31,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Magick.NET-Q8-AnyCPU">
-      <HintPath>..\packages\Magick.NET-Q8-AnyCPU.7.12.0\lib\net40\Magick.NET-Q8-AnyCPU.dll</HintPath>
+      <HintPath>..\packages\Magick.NET-Q8-AnyCPU.7.13.1\lib\net40\Magick.NET-Q8-AnyCPU.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="Newtonsoft.Json">

diff --git a/references/xivModdingFramework.dll b/references/xivModdingFramework.dll