upd

News.xaml

@@ -241,41 +241,26 @@
 	<Line X1="0" X2="100" Stroke="{DynamicResource ColorBrush5}" StrokeThickness="1.5" HorizontalAlignment="Center" Stretch="Fill" Grid.Column="2"/>
 </Grid>
 
-<!-- 1.17.1-pre4 -->
-<local:MyCard x:Name="TOPNEW" Margin="0,0,0,15" Title="最新预发布版 - 1.17.1-pre1" CanSwap="True" >
+<!-- 1.17.1-pre2 -->
+<local:MyCard x:Name="TOPNEW" Margin="0,0,0,15" Title="最新预发布版 - 1.17.1-pre2" CanSwap="True" >
 	<!--Header-->
 	<StackPanel Margin="30,40,30,20">
 		<Border Style="{StaticResource verImgBdr}">
             <Border.Background>
-                <ImageBrush ImageSource="https://www.minecraft.net/content/dam/games/minecraft/screenshots/1-17-1-pre-release-1-header.jpg" Stretch="Uniform"/>
+                <ImageBrush ImageSource="https://www.minecraft.net/content/dam/games/minecraft/screenshots/1-17-1-pre-release-2-header.jpg" Stretch="Uniform"/>
             </Border.Background>
-            <Image Source="https://www.minecraft.net/content/dam/games/minecraft/screenshots/1-17-1-pre-release-1-header.jpg" Opacity="0"/>
+            <Image Source="https://www.minecraft.net/content/dam/games/minecraft/screenshots/1-17-1-pre-release-2-header.jpg" Opacity="0"/>
         </Border>
 		<Border x:Name="verBorder" Style="{StaticResource verTxtBdr}">
-			<TextBlock Style="{StaticResource verTxtBlk}" Text="1.17.1 PRE1" />
+			<TextBlock Style="{StaticResource verTxtBlk}" Text="1.17.1 PRE2" />
 		</Border>
 	<!--Detail-->
-	<TextBlock Text="更改" Style="{StaticResource h2}"/>	
+	<TextBlock Text="技术性修改" Style="{StaticResource h2}"/>	
 
 		<StackPanel Style="{StaticResource ListStyle}">	
 		
 		<Ellipse/>
-		<TextBlock Style="{StaticResource ListItem}" Text="蓝色美西螈现在只能通过繁育获得。" />
-
-		<Ellipse/>
-		<TextBlock Style="{StaticResource ListItem}" Text="非尖叫类型的山羊现在有一定几率繁育出尖叫山羊。" />
-
-		<Ellipse/>
-		<TextBlock Style="{StaticResource ListItem}" Text="现在在山羊跳跃或冲撞时也能向其施加状态效果。" />
-
-		<Ellipse/>
-		<TextBlock Style="{StaticResource ListItem}" Text="将溺尸掉落铜锭的概率提升为 11% + 2% * 抢夺等级。" />
-
-		<Ellipse/>
-		<TextBlock Style="{StaticResource ListItem}" Text="细雪现在在炼药锅的积累速度是原来的两倍（不过还是很慢！）。" />
-
-		<Ellipse/>
-		<TextBlock Style="{StaticResource ListItem}" Text="僵尸，僵尸村民，尸壳和溺尸现在不再会拾起荧光墨囊。" />
+		<TextBlock Style="{StaticResource ListItem}" Text="被命名过的生物死亡会记录到日志。" />
 
 		</StackPanel>
 
@@ -290,8 +275,7 @@
 		</GroupBox>
 		</StackPanel>
 
-	<TextBlock Text="该版本修复了25个Bug" Style="{StaticResource footnote}"/>
-	<TextBlock Text="该新闻部分图片与内容来源于 SpicroGoft(卡狗) (MCBBS)。"  Margin="30,0,0,10"/>
+	<TextBlock Text="该版本修复了8个Bug" Style="{StaticResource footnote}"/>
 	<!--Logs-->
 	<GroupBox Header="阅读完整日志" BorderBrush="{DynamicResource ColorBrush3}">
 		<Grid UseLayoutRounding="True" Margin="10,10,10,10">
@@ -300,9 +284,9 @@
 			<ColumnDefinition Width="10*"></ColumnDefinition>
 			<ColumnDefinition Width="10*"></ColumnDefinition>
 		</Grid.ColumnDefinitions>
-			<local:MyButton Style="{StaticResource Read0}" EventData="https://minecraft.fandom.com/zh/wiki/Java版1.17.1-pre1" ColorType="Highlight"/>
-			<local:MyButton Style="{StaticResource Read1}" EventData="https://www.mcbbs.net/thread-1211734-1-1.html"/>
-			<local:MyButton Style="{StaticResource Read2}" EventData="https://www.minecraft.net/zh-hans/article/minecraft-1-17-1-pre-release-1" />
+			<local:MyButton Style="{StaticResource Read0}" EventData="https://minecraft.fandom.com/zh/wiki/Java版1.17.1-pre2" ColorType="Highlight"/>
+			<local:MyButton Style="{StaticResource Read1}" EventData="https://www.mcbbs.net/thread-1216239-1-1.html"/>
+			<local:MyButton Style="{StaticResource Read2}" EventData="https://www.minecraft.net/zh-hans/article/minecraft-1-17-1-pre-release-2" />
 		</Grid>
 	</GroupBox>
 	</StackPanel>
@@ -336,6 +320,73 @@
 	<Line X1="0" X2="100" Stroke="{DynamicResource ColorBrush5}" StrokeThickness="1.5" HorizontalAlignment="Center" Stretch="Fill" Grid.Column="2"/>
 </Grid>
 
+<!-- 1.17.1-pre1 -->
+<local:MyCard Margin="0,0,0,15" Title="最新预发布版 - 1.17.1-pre1" CanSwap="True" IsSwaped="True">
+	<!--Header-->
+	<StackPanel Margin="30,40,30,20">
+		<Border Style="{StaticResource verImgBdr}">
+            <Border.Background>
+                <ImageBrush ImageSource="https://www.minecraft.net/content/dam/games/minecraft/screenshots/1-17-1-pre-release-1-header.jpg" Stretch="Uniform"/>
+            </Border.Background>
+            <Image Source="https://www.minecraft.net/content/dam/games/minecraft/screenshots/1-17-1-pre-release-1-header.jpg" Opacity="0"/>
+        </Border>
+		<Border Style="{StaticResource verTxtBdr}">
+			<TextBlock Style="{StaticResource verTxtBlk}" Text="1.17.1 PRE1" />
+		</Border>
+	<!--Detail-->
+	<TextBlock Text="更改" Style="{StaticResource h2}"/>	
+
+		<StackPanel Style="{StaticResource ListStyle}">	
+		
+		<Ellipse/>
+		<TextBlock Style="{StaticResource ListItem}" Text="蓝色美西螈现在只能通过繁育获得。" />
+
+		<Ellipse/>
+		<TextBlock Style="{StaticResource ListItem}" Text="非尖叫类型的山羊现在有一定几率繁育出尖叫山羊。" />
+
+		<Ellipse/>
+		<TextBlock Style="{StaticResource ListItem}" Text="现在在山羊跳跃或冲撞时也能向其施加状态效果。" />
+
+		<Ellipse/>
+		<TextBlock Style="{StaticResource ListItem}" Text="将溺尸掉落铜锭的概率提升为 11% + 2% * 抢夺等级。" />
+
+		<Ellipse/>
+		<TextBlock Style="{StaticResource ListItem}" Text="细雪现在在炼药锅的积累速度是原来的两倍（不过还是很慢！）。" />
+
+		<Ellipse/>
+		<TextBlock Style="{StaticResource ListItem}" Text="僵尸，僵尸村民，尸壳和溺尸现在不再会拾起荧光墨囊。" />
+
+		</StackPanel>
+
+	<TextBlock Text="洞穴与山崖预览（1.18内容）" Style="{StaticResource h2}"/>	
+		<StackPanel Style="{StaticResource ListStyle}">
+		<GroupBox Header="关于预览" BorderBrush="{DynamicResource ColorBrush3}" Padding="20,0">
+			<StackPanel>
+				<TextBlock Text="你可以使用官方提供的数据包来尝试后期的地形生成。" Margin="0,10,0,0"/>
+				<local:MyButton Height="35" Margin="80,10" Text="点击下载" EventType="下载文件" EventData="https://launcher.mojang.com/v1/objects/622bf0fd298e1e164ecd05d866045ed5941283cf/CavesAndCliffsPreview.zip" ToolTip="下载洞穴与山崖原型数据包"/>
+				<TextBlock Text="注意：数据包不能被添加至已创建的世界。使用数据包创建的世界会被标记为实验性世界，这些世界不保证能在之后的版本中继续使用。"  Margin="0,0,0,10"/>
+        	</StackPanel>
+		</GroupBox>
+		</StackPanel>
+
+	<TextBlock Text="该版本修复了25个Bug" Style="{StaticResource footnote}"/>
+	<TextBlock Text="该新闻部分图片与内容来源于 SpicroGoft(卡狗) (MCBBS)。"  Margin="30,0,0,10"/>
+	<!--Logs-->
+	<GroupBox Header="阅读完整日志" BorderBrush="{DynamicResource ColorBrush3}">
+		<Grid UseLayoutRounding="True" Margin="10,10,10,10">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="20*"></ColumnDefinition>
+			<ColumnDefinition Width="10*"></ColumnDefinition>
+			<ColumnDefinition Width="10*"></ColumnDefinition>
+		</Grid.ColumnDefinitions>
+			<local:MyButton Style="{StaticResource Read0}" EventData="https://minecraft.fandom.com/zh/wiki/Java版1.17.1-pre1" ColorType="Highlight"/>
+			<local:MyButton Style="{StaticResource Read1}" EventData="https://www.mcbbs.net/thread-1211734-1-1.html"/>
+			<local:MyButton Style="{StaticResource Read2}" EventData="https://www.minecraft.net/zh-hans/article/minecraft-1-17-1-pre-release-1" />
+		</Grid>
+	</GroupBox>
+	</StackPanel>
+</local:MyCard>
+
 <local:MyCard Margin="0,0,0,15" Title="最新正式版 - 1‌‎.17" CanSwap="True" IsSwaped="True">
 	<!--Header-->
 	<StackPanel Margin="30,40,30,20">