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

# Conflicts:
#	resource_pack_Are13Lvd/textures/item_texture.json

resource_pack_Are13Lvd/texts/zh_CN.lang

@@ -1234,6 +1234,7 @@ item.rtdd:grape.name=葡萄
 item.rtdd:peach.name=桃子
 item.rtdd:orange.name=橙子
 item.rtdd:soybean.name=黄豆
+item.rtdd:chaoguo_book.name=炒锅菜谱
 item.rtdd:crushed_carrots.name=胡萝卜碎
 item.rtdd:crushed_scallions.name=葱花碎
 item.rtdd:potato_wedges.name=土豆块