update

Author: andreigec

.gitignore

@@ -1,5 +1,3 @@
-
-/SOURCE/DwarfFortressModMerger.6.0.ReSharper.user
-/SOURCE/_ReSharper.DwarfFortressModMerger
-/SOURCE/DwarfFortressModMerger/obj
-/SOURCE/DwarfFortressModMerger/bin
+*.suo
+bin
+obj

SOURCE/DwarfFortressModMerger/DwarfFortressModMerger.csproj renamed to DwarfFortressModMerger.csproj

@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DwarfFortressModMerger</RootNamespace>
-    <AssemblyName>DwarfFortressModMerger</AssemblyName>
+    <AssemblyName>Dwarf-Fortress-Mod-Merger</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -43,16 +43,8 @@
     <ApplicationIcon>j.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ANDREICSLIB, Version=1.0.80.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ANDREICSLIB.1.0.80.0\lib\net451\ANDREICSLIB.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="ANDREICSLIB, Version=1.0.104.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\ANDREICSLIB.1.0.104.0\lib\net451\ANDREICSLIB.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -78,11 +70,6 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Service References\ServiceReference1\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Compile>
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
@@ -107,35 +94,9 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <None Include="Service References\ServiceReference1\DwarfFortressModMerger.ServiceReference1.TitleInfoServiceModel.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Service References\ServiceReference1\Services.wsdl" />
-    <None Include="Service References\ServiceReference1\Services.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Service References\ServiceReference1\Services1.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Service References\ServiceReference1\Services2.xsd">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="j.ico" />
-    <None Include="Service References\ServiceReference1\Reference.svcmap">
-      <Generator>WCF Proxy Generator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Service References\ServiceReference1\configuration.svcinfo" />
-    <None Include="Service References\ServiceReference1\configuration91.svcinfo" />
-    <None Include="Service References\ServiceReference1\Services.disco" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadataStorage Include="Service References\ServiceReference1\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

SOURCE/DwarfFortressModMerger/DwarfFortressModMerger.csproj.DotSettings.user renamed to DwarfFortressModMerger.csproj.DotSettings.user

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DwarfFortressModMerger", "DwarfFortressModMerger\DwarfFortressModMerger.csproj", "{CE1E85E5-85BC-4358-8053-EB7EDD280303}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DwarfFortressModMerger", "DwarfFortressModMerger.csproj", "{CE1E85E5-85BC-4358-8053-EB7EDD280303}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

SOURCE/DwarfFortressModMerger/DwarfFortressModMerger.csproj.ReSharper.user renamed to DwarfFortressModMerger.csproj.ReSharper.user

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -14,16 +14,12 @@
 using ANDREICSLIB.Helpers;
 using ANDREICSLIB.Licensing;
 using DwarfFortressModMerger.Properties;
-using DwarfFortressModMerger.ServiceReference1;
 
 namespace DwarfFortressModMerger
 {
     public partial class Form1 : Form
     {
         #region licensing
-
-        private const string AppTitle = "Dwarf Fortress Mod Merger";
-        private const double AppVersion = 0.4;
         private const String HelpString = "";
 
         private readonly String OtherText =
@@ -34,6 +30,7 @@ Licensed under GNU LGPL (http://www.gnu.org/)
 
 Zip Assets © SharpZipLib (http://www.sharpdevelop.net/OpenSource/SharpZipLib/)
 ";
+
         #endregion
 
         public Form1()
@@ -48,7 +45,7 @@ private void exitToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            Licensing.CreateLicense(this, menuStrip1, new Licensing.SolutionDetails(GetDetails, HelpString, AppTitle, AppVersion, OtherText));
+            Licensing.LicensingForm(this, menuStrip1, HelpString, OtherText);
 
             LoadConfig();
             if (vanillaLB.Items.Count >= 1)
@@ -63,34 +60,7 @@ private void Form1_Load(object sender, EventArgs e)
             //init clientside
             Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("");
         }
-
-        public Licensing.DownloadedSolutionDetails GetDetails()
-        {
-            try
-            {
-                var sr = new ServicesClient();
-                var ti = sr.GetTitleInfo(AppTitle);
-                if (ti == null)
-                    return null;
-                return ToDownloadedSolutionDetails(ti);
-
-            }
-            catch (Exception)
-            {
-            }
-            return null;
-        }
-
-        public static Licensing.DownloadedSolutionDetails ToDownloadedSolutionDetails(TitleInfoServiceModel tism)
-        {
-            return new Licensing.DownloadedSolutionDetails()
-            {
-                ZipFileLocation = tism.LatestTitleDownloadPath,
-                ChangeLog = tism.LatestTitleChangelog,
-                Version = tism.LatestTitleVersion
-            };
-        }
-
+        
         private const string cfgpath = "DFMM.cfg";
         private void SaveConfig()
         {