Skip to content

Commit a08904c

Browse files
committed
Obsidian 1.4.0.0
1 parent 969dcef commit a08904c

17 files changed

+502
-203
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Fantome.Libraries.League"]
2+
path = Fantome.Libraries.League
3+
url = https://github.com/LoL-Fantome/Fantome.Libraries.League

Fantome.Libraries.League

Obsidian.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.15
4+
VisualStudioVersion = 15.0.27004.2005
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Obsidian", "Obsidian\Obsidian.csproj", "{7ABEFBE2-A68B-4D8E-A24E-7867C4AD1364}"
77
EndProject

Obsidian/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
55
</startup>
6-
</configuration>
6+
</configuration>

Obsidian/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</Window.Triggers>
3434
<Grid>
3535
<StackPanel Orientation="Vertical">
36-
<TextBlock x:Name="textBlockSelectedEntryName" Margin="11,10,9,0" Height="20"/>
36+
<ProgressBar x:Name="progressBarWadExtraction" Margin="11,10,9,0" Height="20" Visibility="Hidden"/>
3737
<Grid>
3838
<DataGrid Height="475" x:Name="datagridWadEntries" Margin="10,10,10,0" AutoGenerateColumns="False" GridLinesVisibility="Vertical" VerticalGridLinesBrush="#7F000000" SelectedCellsChanged="datagridWadEntries_SelectedCellsChanged" BeginningEdit="datagridWadEntries_BeginningEdit">
3939
<DataGrid.Columns>

Obsidian/MainWindow.xaml.cs

Lines changed: 222 additions & 146 deletions
Large diffs are not rendered by default.

Obsidian/Obsidian.csproj

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>Obsidian</RootNamespace>
1010
<AssemblyName>Obsidian</AssemblyName>
11-
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<WarningLevel>4</WarningLevel>
1515
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,7 +34,13 @@
3334
<ErrorReport>prompt</ErrorReport>
3435
<WarningLevel>4</WarningLevel>
3536
</PropertyGroup>
37+
<PropertyGroup>
38+
<ApplicationIcon>icon.ico</ApplicationIcon>
39+
</PropertyGroup>
3640
<ItemGroup>
41+
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
42+
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
43+
</Reference>
3744
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3845
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
3946
</Reference>
@@ -58,6 +65,9 @@
5865
<Generator>MSBuild:Compile</Generator>
5966
<SubType>Designer</SubType>
6067
</ApplicationDefinition>
68+
<Compile Include="Utils\ConfigUtilities.cs" />
69+
<Compile Include="Utils\Logging.cs" />
70+
<Compile Include="Utils\WADHashGenerator.cs" />
6171
<Compile Include="ValueConverters\WadNameConverter.cs" />
6272
<Compile Include="ValueConverters\SizeValueConverter.cs" />
6373
<Compile Include="Windows\AboutWindow.xaml.cs">
@@ -125,8 +135,8 @@
125135
<Resource Include="icon.ico" />
126136
</ItemGroup>
127137
<ItemGroup>
128-
<ProjectReference Include="..\..\Fantome.Libraries.League\Fantome.League\Fantome.Libraries.League.csproj">
129-
<Project>{80F5DF93-19A2-4731-8CD1-982F165D7361}</Project>
138+
<ProjectReference Include="..\Fantome.Libraries.League\Fantome.League\Fantome.Libraries.League.csproj">
139+
<Project>{80f5df93-19a2-4731-8cd1-982f165d7361}</Project>
130140
<Name>Fantome.Libraries.League</Name>
131141
</ProjectReference>
132142
</ItemGroup>

Obsidian/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.3.0.1")]
55-
[assembly: AssemblyFileVersion("1.0.0.0")]
54+
[assembly: AssemblyVersion("1.4.0.0")]
55+
[assembly: AssemblyFileVersion("1.4.0.0")]

Obsidian/Properties/Resources.Designer.cs

Lines changed: 18 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Obsidian/Properties/Settings.Designer.cs

Lines changed: 9 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)