U | Update

docs/ZH-Server/intro.md

@@ -1,11 +1,6 @@
 <div align="center">
-<<<<<<< HEAD:README.md
     <img width="125" src="/photos/ZH-Server.png">
     <img width="300" src="/photos/title.png">
-=======
-    <img width="175" src="/docs/ZH-Server/photos/ZH-Server.png">
-    <img width="175" src="/docs/ZH-Server/photos/title.png">
->>>>>>> neo:docs/ZH-Server/intro.md
 </div>
 <h1 align="center">ZH-Server服务器——保持原生的基岩版公益生存服务器</h1>
 

docs/ZH-Server/plug.md

@@ -16,9 +16,5 @@
 
 以及LL自带的一些插件
 
-<<<<<<< HEAD:plug.md
-[返回主页](/README.md "点我返回主页 QwQ")
-=======
 在此感谢以上所有项目的贡献者！
 
->>>>>>> neo:docs/ZH-Server/plug.md

docs/ZH-Server/resouce.md

@@ -6,7 +6,3 @@
 
 [Damage Indicator Addon]()
 
-<<<<<<< HEAD:resouce.md
-[返回主页](/README.md "点我返回主页 QwQ")
-=======
->>>>>>> neo:docs/ZH-Server/resouce.md

mkdocs.yml

@@ -2,3 +2,28 @@ site_name: Huang FTS427's Blog
 theme:
   name: material
   locale: zh
+markdown_extensions:
+  - admonition
+  - codehilite:
+      guess_lang: false
+      linenums: false
+  - toc:
+      permalink: true
+  - footnotes
+  - meta
+  - def_list
+  - pymdownx.arithmatex
+  - pymdownx.betterem:
+      smart_enable: all
+  - pymdownx.caret
+  - pymdownx.critic
+  - pymdownx.details
+  - pymdownx.emoji:
+      emoji_generator: !!python/name:pymdownx.emoji.to_png
+  - pymdownx.inlinehilite
+  - pymdownx.magiclink
+  - pymdownx.mark
+  - pymdownx.smartsymbols
+  - pymdownx.superfences
+  - pymdownx.tasklist
+  - pymdownx.tilde