Merge branch 'ceshi' of https://gitee.com/netease-module-development/rural-decoration into ceshi

# Conflicts:
#	behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/System/Ui/CookRecipe.py
#	behavior_pack_v8jz0zSR/netease_blocks/b_59.json
#	behavior_pack_v8jz0zSR/netease_blocks/b_60.json
#	behavior_pack_v8jz0zSR/netease_blocks/b_61.json
#	behavior_pack_v8jz0zSR/netease_blocks/b_62.json
#	behavior_pack_v8jz0zSR/netease_blocks/b_63.json
#	behavior_pack_v8jz0zSR/netease_blocks/cloth.json
#	behavior_pack_v8jz0zSR/netease_blocks/steamermilkandegg.json
#	behavior_pack_v8jz0zSR/netease_blocks/steamermilkandegg_1.json
#	behavior_pack_v8jz0zSR/netease_group/baked_groups.json
#	behavior_pack_v8jz0zSR/netease_tab/xy_cloth.json
#	resource_pack_Are13Lvd/texts/zh_CN.lang

behavior_pack_v8jz0zSR/netease_items_beh/rtdd_oilfrenchfries.json

@@ -3,7 +3,7 @@
   "minecraft:item": {
     "description": {
       "identifier": "rtdd:oilfrenchfries",
-      "category": "xy_ingredients"
+      "category": "rtdd"
     },
     "components": {
       "minecraft:max_stack_size": 64