Merge remote-tracking branch 'origin/ceshi' into ceshi

# Conflicts:
#	resource_pack_Are13Lvd/textures/item_texture.json

behavior_pack_v8jz0zSR/netease_items_beh/rtdd_chaoguo_book.json

@@ -0,0 +1,10 @@
+{
+    "format_version": "1.10",
+    "minecraft:item": {
+        "components": {},
+        "description": {
+            "category": "xy_chaoguo",
+            "identifier": "rtdd:chaoguo_book"
+        }
+    }
+}