Skip to content

Commit

Permalink
🔀 Merge pull request #3 from MaikEight/develop
Browse files Browse the repository at this point in the history
🔀 Merge Develop into main
  • Loading branch information
MaikEight authored Jun 2, 2023
2 parents a177208 + af73e1c commit 5d4ea89
Show file tree
Hide file tree
Showing 99 changed files with 3,872 additions and 947 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -790,3 +790,5 @@ FodyWeavers.xsd
/.vs/EAM/v17/fileList.bin
/.vs/EAM/v17/.suo
/.vs/EAM/DesignTimeBuild/.dtbcache.v2
/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.exe
/EAM Daily Login Service/obj/Release/EAM Daily Login Service.exe
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,9 @@ C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debu
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.Licensing.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Captcha_Solver_UI_Lib.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\RestSharp.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Updater_Lib.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Captcha_Solver_UI_Lib.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Captcha_Solver_UI_Lib.dll.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\RestSharp.xml
Binary file not shown.
Binary file modified EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
09cc3bb8441a5277425da76d4cb62e6898768c95
e77e9aa04502103eb6ea045c019197e6cac593b6
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,37 @@ C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Rele
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Newtonsoft.Json.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Lib.dll.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.SuggestedBindingRedirects.cache
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_General_Services_Lib.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Win32.TaskScheduler.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.Charts.WinForms.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Analytics.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Discord_Lib.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Updater_Lib.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Captcha_Solver_UI_Lib.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.Licensing.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\DiscordRPC.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\RestSharp.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\CsvHelper.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_General_Services_Lib.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Win32.TaskScheduler.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.Charts.WinForms.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Analytics.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Discord_Lib.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Updater_Lib.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Captcha_Solver_UI_Lib.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Captcha_Solver_UI_Lib.dll.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.Licensing.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Bcl.AsyncInterfaces.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\RestSharp.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\de\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\es\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\fr\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\it\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\pl\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\ru\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\zh-CN\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\zh-Hant\Microsoft.Win32.TaskScheduler.resources.dll
Binary file not shown.
Binary file modified EAM Daily Login Service/obj/Release/EAM Daily Login Service.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions EAM PingChecker/EAM PingChecker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,10 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.7.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.7.0\build\Fody.targets'))" />
</Target>
<Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
<Import Project="..\packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.4\build\Fody.targets')" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\Fody.6.7.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.7.0\build\Fody.targets')" />
</Project>
Binary file not shown.
8 changes: 4 additions & 4 deletions EAM PingChecker/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<package id="Bunifu.UI.WinForms" version="6.1.0" targetFramework="net48" />
<package id="Bunifu.UI.WinForms.1.5.3" version="1.0.0" targetFramework="net48" />
<package id="Costura.Fody" version="5.7.0" targetFramework="net48" developmentDependency="true" />
<package id="Fody" version="6.6.4" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.NETCore.Platforms" version="7.0.1" targetFramework="net48" />
<package id="Fody" version="6.7.0" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.NETCore.Platforms" version="7.0.2" targetFramework="net48" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
<package id="Microsoft.Win32.Registry.AccessControl" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Win32.SystemEvents" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Windows.Compatibility" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Windows.Compatibility" version="7.0.1" targetFramework="net48" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="RestSharpSigned" version="105.2.3" targetFramework="net48" />
Expand Down Expand Up @@ -50,7 +50,7 @@
<package id="System.IO.Ports" version="7.0.0" targetFramework="net48" />
<package id="System.Linq" version="4.3.0" targetFramework="net48" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net48" />
<package id="System.Management" version="7.0.0" targetFramework="net48" />
<package id="System.Management" version="7.0.1" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net48" />
Expand Down
4 changes: 2 additions & 2 deletions EAM Statistics/EAM Statistics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -636,10 +636,10 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.7.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.7.0\build\Fody.targets'))" />
</Target>
<Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
<Import Project="..\packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.4\build\Fody.targets')" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\Fody.6.7.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.7.0\build\Fody.targets')" />
</Project>
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions EAM Statistics/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<package id="Bunifu.UI.WinForms" version="6.1.0" targetFramework="net48" />
<package id="Bunifu.UI.WinForms.1.5.3" version="1.0.0" targetFramework="net48" />
<package id="Costura.Fody" version="5.7.0" targetFramework="net48" developmentDependency="true" />
<package id="Fody" version="6.6.4" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.NETCore.Platforms" version="7.0.1" targetFramework="net48" />
<package id="Fody" version="6.7.0" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.NETCore.Platforms" version="7.0.2" targetFramework="net48" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
<package id="Microsoft.Win32.Registry.AccessControl" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Win32.SystemEvents" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Windows.Compatibility" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Windows.Compatibility" version="7.0.1" targetFramework="net48" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="RestSharpSigned" version="105.2.3" targetFramework="net48" />
Expand Down Expand Up @@ -49,7 +49,7 @@
<package id="System.IO.Ports" version="7.0.0" targetFramework="net48" />
<package id="System.Linq" version="4.3.0" targetFramework="net48" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net48" />
<package id="System.Management" version="7.0.0" targetFramework="net48" />
<package id="System.Management" version="7.0.1" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net48" />
Expand Down
4 changes: 2 additions & 2 deletions EAM Tasktray Tool/EAM Tasktray Tool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,10 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.7.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.7.0\build\Fody.targets'))" />
</Target>
<Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
<Import Project="..\packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.4\build\Fody.targets')" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\Fody.6.7.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.7.0\build\Fody.targets')" />
</Project>
8 changes: 4 additions & 4 deletions EAM Tasktray Tool/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<package id="Bunifu.UI.WinForms" version="6.1.0" targetFramework="net48" />
<package id="Bunifu.UI.WinForms.1.5.3" version="1.0.0" targetFramework="net48" />
<package id="Costura.Fody" version="5.7.0" targetFramework="net48" developmentDependency="true" />
<package id="Fody" version="6.6.4" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.NETCore.Platforms" version="7.0.1" targetFramework="net48" />
<package id="Fody" version="6.7.0" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.NETCore.Platforms" version="7.0.2" targetFramework="net48" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
<package id="Microsoft.Win32.Registry.AccessControl" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Win32.SystemEvents" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Windows.Compatibility" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Windows.Compatibility" version="7.0.1" targetFramework="net48" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="RestSharpSigned" version="105.2.3" targetFramework="net48" />
Expand Down Expand Up @@ -49,7 +49,7 @@
<package id="System.IO.Ports" version="7.0.0" targetFramework="net48" />
<package id="System.Linq" version="4.3.0" targetFramework="net48" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net48" />
<package id="System.Management" version="7.0.0" targetFramework="net48" />
<package id="System.Management" version="7.0.1" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net48" />
Expand Down
4 changes: 2 additions & 2 deletions EAM Vault Peeker/EAM Vault Peeker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -477,10 +477,10 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.7.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.7.0\build\Fody.targets'))" />
</Target>
<Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
<Import Project="..\packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.4\build\Fody.targets')" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\Fody.6.7.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.7.0\build\Fody.targets')" />
</Project>
Loading

0 comments on commit 5d4ea89

Please sign in to comment.