|
|
@@ -238,8 +238,13 @@
|
|
|
</StackPanel>
|
|
|
</local:MyCard>
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
<!-- 1.17-rc1 -->
|
|
|
<local:MyCard x:Name="TOPNEW" Margin="0,0,0,15" Title="最新发布候选版本 - 1.17-rc1" CanSwap="True">
|
|
|
+=======
|
|
|
+<!-- 1.17-pre5 -->
|
|
|
+<local:MyCard x:Name="TOPNEW" Margin="0,0,0,15" Title="最新预发布版本 - 1.17-pre5" CanSwap="True">
|
|
|
+>>>>>>> 3b0a81d54e954c3033d1fc0146de008a2b7e16ff
|
|
|
<!--Header-->
|
|
|
<StackPanel Margin="30,40,30,20">
|
|
|
<Border Style="{StaticResource verImgBdr}">
|
|
|
@@ -249,7 +254,11 @@
|
|
|
<Image Source="https://www.minecraft.net/content/dam/games/minecraft/screenshots/1-17-release-candidate-1-header.jpg" Opacity="0"/>
|
|
|
</Border>
|
|
|
<Border x:Name="verBorder" Style="{StaticResource verTxtBdr}">
|
|
|
+<<<<<<< HEAD
|
|
|
<TextBlock Style="{StaticResource verTxtBlk}" Text="1.17 RC1"/>
|
|
|
+=======
|
|
|
+ <TextBlock Style="{StaticResource verTxtBlk}" Text="1.17 PRE5"/>
|
|
|
+>>>>>>> 3b0a81d54e954c3033d1fc0146de008a2b7e16ff
|
|
|
</Border>
|
|
|
<!--Detail-->
|
|
|
<TextBlock Text="洞穴与山崖预览（1.18内容）" Style="{StaticResource h2}"/>
|
|
|
@@ -263,7 +272,11 @@
|
|
|
</GroupBox>
|
|
|
</StackPanel>
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
<TextBlock Text="该版本修复了3个Bug" Style="{StaticResource footnote}"/>
|
|
|
+=======
|
|
|
+ <TextBlock Text="该版本修复了5个Bug" Style="{StaticResource footnote}"/>
|
|
|
+>>>>>>> 3b0a81d54e954c3033d1fc0146de008a2b7e16ff
|
|
|
|
|
|
<!--Logs-->
|
|
|
<GroupBox Header="阅读完整日志" BorderBrush="{DynamicResource ColorBrush3}">
|
|
|
@@ -273,7 +286,11 @@
|
|
|
<ColumnDefinition Width="10*"></ColumnDefinition>
|
|
|
<ColumnDefinition Width="10*"></ColumnDefinition>
|
|
|
</Grid.ColumnDefinitions>
|
|
|
+<<<<<<< HEAD
|
|
|
<local:MyButton Style="{StaticResource Read0}" EventData="https://minecraft.fandom.com/zh/wiki/Java版1.17-rc1" ColorType="Highlight"/>
|
|
|
+=======
|
|
|
+ <local:MyButton Style="{StaticResource Read0}" EventData="https://minecraft.fandom.com/zh/wiki/Java版1.17-pre5" ColorType="Highlight"/>
|
|
|
+>>>>>>> 3b0a81d54e954c3033d1fc0146de008a2b7e16ff
|
|
|
<local:MyButton Style="{StaticResource Read1}" EventData="https://www.mcbbs.net/thread-1206553-1-1.html"/>
|
|
|
<local:MyButton Style="{StaticResource Read2}" EventData="https://www.minecraft.net/zh-hans/article/minecraft-1-17-release-candidate-1" />
|
|
|
</Grid>
|
|
|
@@ -354,6 +371,7 @@
|
|
|
<Line X1="0" X2="100" Stroke="{DynamicResource ColorBrush5}" StrokeThickness="1.5" HorizontalAlignment="Center" Stretch="Fill" Grid.Column="2"/>
|
|
|
</Grid>
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
<!-- 1.17-pre5 -->
|
|
|
<local:MyCard Margin="0,0,0,15" Title="1.17-pre5" CanSwap="True" IsSwaped="True">
|
|
|
<!--Header-->
|
|
|
@@ -397,6 +415,8 @@
|
|
|
</StackPanel>
|
|
|
</local:MyCard>
|
|
|
|
|
|
+=======
|
|
|
+>>>>>>> 3b0a81d54e954c3033d1fc0146de008a2b7e16ff
|
|
|
<!-- 1.17-pre4 -->
|
|
|
<local:MyCard Margin="0,0,0,15" Title="1.17-pre4" CanSwap="True" IsSwaped="True" >
|
|
|
<!--Header-->
|
LightBeacon