Skip to content

Commit a9560d5

Browse files
committed
up
1 parent 712ad4f commit a9560d5

7 files changed

Lines changed: 32 additions & 12 deletions

File tree

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "MinecraftSkinRender"]
22
path = MinecraftSkinRender
33
url = https://github.com/Coloryr/MinecraftSkinRender.git
4+
[submodule "Markdown.AIRender"]
5+
path = Markdown.AIRender
6+
url = https://github.com/Coloryr/Markdown.AIRender.git

Markdown.AIRender

Submodule Markdown.AIRender added at 730cda1

src/ColorMC.Gui/ColorMC.Gui.csproj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@
351351
<PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1" />
352352
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
353353
<PackageReference Include="DialogHost.Avalonia" Version="0.9.3" />
354-
<PackageReference Include="MarkdownAIRender" Version="0.1.16" />
355354
<PackageReference Include="Silk.NET.SDL" Version="2.22.0" />
356355
<PackageReference Include="SkiaSharp" Version="2.88.9" />
357356
<PackageReference Include="DotNetty.Buffers" Version="0.7.6" />
@@ -360,17 +359,10 @@
360359
<PackageReference Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
361360
</ItemGroup>
362361
<ItemGroup>
362+
<ProjectReference Include="..\..\Markdown.AIRender\src\MarkdownAIRender\MarkdownAIRender.csproj" />
363363
<ProjectReference Include="..\..\MinecraftSkinRender\MinecraftSkinRender.Image\MinecraftSkinRender.Image.csproj" />
364364
<ProjectReference Include="..\..\MinecraftSkinRender\MinecraftSkinRender.OpenGL\MinecraftSkinRender.OpenGL.csproj" />
365365
<ProjectReference Include="..\..\MinecraftSkinRender\MinecraftSkinRender\MinecraftSkinRender.csproj" />
366366
<ProjectReference Include="..\ColorMC.Core\ColorMC.Core.csproj" />
367367
</ItemGroup>
368-
<ItemGroup>
369-
<Compile Update="UI\Controls\Add\AddFileInfoControl.axaml.cs">
370-
<DependentUpon>AddFileInfoControl.axaml</DependentUpon>
371-
</Compile>
372-
<Compile Update="UI\Controls\Add\AddResourceControl.axaml.cs">
373-
<DependentUpon>AddResourceControl.axaml</DependentUpon>
374-
</Compile>
375-
</ItemGroup>
376368
</Project>

src/ColorMC.Gui/Style/TextBlock.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<Style Selector="TextBlock">
1414
<Setter Property="Foreground" Value="{setting:Theme FontColor}" />
15+
<Setter Property="FontWeight" Value="Normal" />
1516
<Setter Property="VerticalAlignment" Value="Center" />
1617
</Style>
1718

src/ColorMC.Gui/Style/TextBox.axaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</Design.PreviewWith>
1919

2020
<Style Selector="TextBox">
21+
<Setter Property="FontWeight" Value="Normal" />
2122
<Setter Property="Foreground" Value="{setting:Theme FontColor}" />
2223
<Setter Property="BorderBrush" Value="{setting:Theme AllBorder}" />
2324
<Setter Property="CornerRadius" Value="5" />
@@ -33,6 +34,7 @@
3334
</Style>
3435

3536
<Style Selector="TextBox.input1">
37+
<Setter Property="FontWeight" Value="Normal" />
3638
<Setter Property="Foreground" Value="{setting:Theme FontColor}" />
3739
<Setter Property="BorderThickness" Value="0,0,0,1" />
3840
<Setter Property="CornerRadius" Value="0" />

src/ColorMC.Gui/UI/Controls/GameConfigEdit/GameConfigEditControl.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.ComponentModel;
2-
using System.Threading.Tasks;
32
using Avalonia.Controls;
43
using Avalonia.Input;
54
using Avalonia.Media.Imaging;

src/ColorMC.sln

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.4.33015.44
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11205.157 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorMC.Gui", "ColorMC.Gui\ColorMC.Gui.csproj", "{90603F2B-466D-46F9-A7B4-DC02352A4951}"
77
EndProject
@@ -25,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinecraftSkinRender.OpenGL"
2525
EndProject
2626
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinecraftSkinRender.Image", "..\MinecraftSkinRender\MinecraftSkinRender.Image\MinecraftSkinRender.Image.csproj", "{91E55181-A289-3EB5-157E-41873A369DB2}"
2727
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkdownAIRender", "..\Markdown.AIRender\src\MarkdownAIRender\MarkdownAIRender.csproj", "{0C8759B4-9AE4-C322-87EE-99878992CD0E}"
29+
EndProject
2830
Global
2931
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3032
Debug|Any CPU = Debug|Any CPU
@@ -199,6 +201,26 @@ Global
199201
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|x64.Build.0 = Release|Any CPU
200202
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|x86.ActiveCfg = Release|Any CPU
201203
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|x86.Build.0 = Release|Any CPU
204+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
205+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
206+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|ARM.ActiveCfg = Debug|Any CPU
207+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|ARM.Build.0 = Debug|Any CPU
208+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
209+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|ARM64.Build.0 = Debug|Any CPU
210+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|x64.ActiveCfg = Debug|Any CPU
211+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|x64.Build.0 = Debug|Any CPU
212+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|x86.ActiveCfg = Debug|Any CPU
213+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Debug|x86.Build.0 = Debug|Any CPU
214+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
215+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|Any CPU.Build.0 = Release|Any CPU
216+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|ARM.ActiveCfg = Release|Any CPU
217+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|ARM.Build.0 = Release|Any CPU
218+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|ARM64.ActiveCfg = Release|Any CPU
219+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|ARM64.Build.0 = Release|Any CPU
220+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|x64.ActiveCfg = Release|Any CPU
221+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|x64.Build.0 = Release|Any CPU
222+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|x86.ActiveCfg = Release|Any CPU
223+
{0C8759B4-9AE4-C322-87EE-99878992CD0E}.Release|x86.Build.0 = Release|Any CPU
202224
EndGlobalSection
203225
GlobalSection(SolutionProperties) = preSolution
204226
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)