Merge pull request #5

Merge dev into master
ojemineh · Jun 10, 2021 · 5a9abf4 · 5a9abf4
2 parents d42db10 + df5c56e
commit 5a9abf4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/DayZLootEdit/App.config b/DayZLootEdit/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 </configuration>
diff --git a/DayZLootEdit/DayZLootEdit.csproj b/DayZLootEdit/DayZLootEdit.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>DayZLootEdit</RootNamespace>
     <AssemblyName>DayZLootEdit</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -25,8 +25,8 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>0.3.13.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>0.3.14.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -141,9 +141,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 und x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

diff --git a/DayZLootEdit/MainWindow.xaml b/DayZLootEdit/MainWindow.xaml
@@ -65,6 +65,7 @@
                     <MenuItem x:Name="MnuEditLifetime180"       Header="180s [3m]"          Click="MnuEditLifetimeValue_Click" Tag="180"/>
                     <MenuItem x:Name="MnuEditLifetime120"       Header="120s [2m]"          Click="MnuEditLifetimeValue_Click" Tag="120"/>
                     <MenuItem x:Name="MnuEditLifetime60"        Header="60s [1m]"           Click="MnuEditLifetimeValue_Click" Tag="60"/>
+                    <MenuItem x:Name="MnuEditLifetime30"        Header="30s"                Click="MnuEditLifetimeValue_Click" Tag="30"/>
                     <MenuItem x:Name="MnuEditLifetime3"         Header="3s"                 Click="MnuEditLifetimeValue_Click" Tag="3"/>
                     <MenuItem x:Name="MnuEditLifetime0"         Header="0s"                 Click="MnuEditLifetimeValue_Click" Tag="0"/>
                 </MenuItem>
@@ -92,6 +93,7 @@
                     <MenuItem x:Name="MnuEditRestock180"        Header="180s [3m]"          Click="MnuEditRestockValue_Click" Tag="180"/>
                     <MenuItem x:Name="MnuEditRestock120"        Header="120s [2m]"          Click="MnuEditRestockValue_Click" Tag="120"/>
                     <MenuItem x:Name="MnuEditRestock60"         Header="60s [1m]"           Click="MnuEditRestockValue_Click" Tag="60"/>
+                    <MenuItem x:Name="MnuEditRestock30"         Header="30s"                Click="MnuEditRestockValue_Click" Tag="30"/>
                     <MenuItem x:Name="MnuEditRestock3"          Header="3s"                 Click="MnuEditRestockValue_Click" Tag="3"/>
                     <MenuItem x:Name="MnuEditRestock0"          Header="0s"                 Click="MnuEditRestockValue_Click" Tag="0"/>
                 </MenuItem>

diff --git a/DayZLootEdit/Properties/AssemblyInfo.cs b/DayZLootEdit/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 // Allgemeine Informationen über eine Assembly werden über die folgenden
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("DayZ LootEditor")]
+[assembly: AssemblyTitle("DayZ Loot Editor")]
 [assembly: AssemblyDescription("A tool to edit the looting table of DayZ (Standalone)")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DayZ LootEditor")]
+[assembly: AssemblyProduct("DayZ Loot Editor")]
 [assembly: AssemblyCopyright("Copyright © 2021 by Ojemineh")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.13.2")]
-[assembly: AssemblyFileVersion("0.3.13.2")]
+[assembly: AssemblyVersion("0.3.14.0")]
+[assembly: AssemblyFileVersion("0.3.14.0")]