Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1

Signed-off-by: 延皓 <harvey_husky@foxmail.com>

README.md

@@ -2,11 +2,9 @@
 
 为FZ服务器写的Minecraft生存辅助数据包
 
-<<<<<<< HEAD
+
 [![数据包版本](https://img.shields.io/badge/正式版-3.1.12-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
-=======
-[![数据包版本](https://img.shields.io/badge/正式版-3.1.11-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20|1.21+-blue.svg)](https://minecraft.net/)
->>>>>>> 82b1f0dcddcbfbb46d1ab272ded9c453531be507
+
 
 > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
 

data/fzsd/function/boot.mcfunction

@@ -1,4 +1,4 @@
-execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.12'}}
+execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.14'}}
 execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update
 function fzsd:system/carpet/try_load_fzsd_score
 function #fzsd:load

data/fzsd/functions/boot.mcfunction

@@ -1,4 +1,4 @@
-execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.12'}}
+execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.14'}}
 execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update
 function fzsd:system/carpet/try_load_fzsd_score
 function #fzsd:load

data/fzsd/tags/blocks/placed_liquid_ignore.json

@@ -0,0 +1,7 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:liquid",
+        "minecraft:powder_snow"
+    ]
+}