Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cadon/ARKStatsExtractor
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.20.8.1
Choose a base ref
...
head repository: cadon/ARKStatsExtractor
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 485 changed files with 233,650 additions and 13,337 deletions.
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: [coldino]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: cadaei
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ dlldata.c
project.lock.json
artifacts/

Thumbs.db
*_i.c
*_p.c
*_i.h
@@ -210,3 +211,4 @@ FakesAssemblies/
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
/_publish/
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "ArkSavegameToolkit"]
path = ArkSavegameToolkit
url = https://github.com/cadon/ArkSavegameToolkit.git
branch = master
41 changes: 39 additions & 2 deletions ARKBreedingStats.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.32002.261
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ARKBreedingStats", "ARKBreedingStats\ARKBreedingStats.csproj", "{991563CE-6B2C-40AE-BC80-A14F090A4D26}"
ProjectSection(ProjectDependencies) = postProject
{03708FF0-F790-4618-B3D0-E59AEB74F022} = {03708FF0-F790-4618-B3D0-E59AEB74F022}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASB Updater", "ASB-Updater\ASB Updater.csproj", "{03708FF0-F790-4618-B3D0-E59AEB74F022}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArkSavegameToolkit", "ArkSavegameToolkit", "{74D3CB19-BAE4-456A-B45E-0711091AECD9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SavegameToolkit", "ArkSavegameToolkit\SavegameToolkit\SavegameToolkit.csproj", "{4353EDA3-8092-4641-9B69-347F7DA9FD59}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SavegameToolkitAdditions", "ArkSavegameToolkit\SavegameToolkitAdditions\SavegameToolkitAdditions.csproj", "{B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_meta", "_meta", "{5DAADC66-3EF7-439E-9AA9-9D328BDE710D}"
ProjectSection(SolutionItems) = preProject
LICENSE = LICENSE
README.md = README.md
translations.txt = translations.txt
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,8 +33,27 @@ Global
{991563CE-6B2C-40AE-BC80-A14F090A4D26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{991563CE-6B2C-40AE-BC80-A14F090A4D26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{991563CE-6B2C-40AE-BC80-A14F090A4D26}.Release|Any CPU.Build.0 = Release|Any CPU
{03708FF0-F790-4618-B3D0-E59AEB74F022}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03708FF0-F790-4618-B3D0-E59AEB74F022}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03708FF0-F790-4618-B3D0-E59AEB74F022}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03708FF0-F790-4618-B3D0-E59AEB74F022}.Release|Any CPU.Build.0 = Release|Any CPU
{4353EDA3-8092-4641-9B69-347F7DA9FD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4353EDA3-8092-4641-9B69-347F7DA9FD59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4353EDA3-8092-4641-9B69-347F7DA9FD59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4353EDA3-8092-4641-9B69-347F7DA9FD59}.Release|Any CPU.Build.0 = Release|Any CPU
{B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4353EDA3-8092-4641-9B69-347F7DA9FD59} = {74D3CB19-BAE4-456A-B45E-0711091AECD9}
{B1009EBC-95C7-4A9F-AFF3-CD3254F5D602} = {74D3CB19-BAE4-456A-B45E-0711091AECD9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5A412CA-3116-4544-A452-7C5827D3B824}
EndGlobalSection
EndGlobal
18 changes: 18 additions & 0 deletions ARKBreedingStats.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_OWNER_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_INSIDE_NAMESPACE/@EntryValue">0</s:Int64>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INVOCABLE_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FINALLY_ON_NEW_LINE/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/TYPE_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
Loading