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

# Conflicts:
#	resource_pack_Are13Lvd/textures/item_texture.json

resource_pack_Are13Lvd/textures/item_texture.json

@@ -106,6 +106,18 @@
         "rtdd:recipe_book": {
             "textures": "textures/items/rtdd/rtdd_recipe_book"
         },
+        "rice_balls": {
+            "textures": "textures/items/rice_balls"
+        },
+        "rice_seeds": {
+            "textures": "textures/items/rice_seeds"
+        },
+        "chaoguo_book": {
+            "textures": "textures/items/chaoguo_book"
+        },
+        "rtdd:chaoguo_book": {
+            "textures": "textures/items/chaoguo_book"
+        },
         "rtdd:soybean": {
             "textures": "textures/items/soybean"
         },
@@ -133,8 +145,32 @@
         "thedriedfish": {
             "textures": "textures/items/thedriedfish"
         },
+        "boiled_egg": {
+            "textures": "textures/items/boiled_egg"
+        },
+        "cream_0": {
+            "textures": "textures/items/cream_0"
+        },
+        "crushed_carrots": {
+            "textures": "textures/items/crushed_carrots"
+        },
+        "crushed_scallions": {
+            "textures": "textures/items/crushed_scallions"
+        },
+        "potato_wedges": {
+            "textures": "textures/items/potato_wedges"
+        },
+        "rice_balls": {
+            "textures": "textures/items/rice_balls"
+        },
+        "rice_seeds": {
+            "textures": "textures/items/rice_seeds"
+        },
         "vegetable": {
             "textures": "textures/items/vegetable"
+        },
+        "qingcai": {
+            "textures": "textures/items/meiqiedeqingcai"
         }
     }
 }