Merge branch 'master' into grass_side-texture

CREDITS.md

@@ -50,6 +50,7 @@
 * yutyo
 * ztianyang
 * j45
+* WC
 
 ## MineClone5
 * kay27

mods/HUD/mcl_credits/init.lua

@@ -56,6 +56,7 @@ mcl_credits.people = {
 		"yutyo",
 		"ztianyang",
 		"j45",
+		"WC",
 	}},
 	{"MineClone5", 0xA60014, {
 		"kay27",

mods/ITEMS/mcl_core/nodes_base.lua

@@ -361,7 +361,7 @@ minetest.register_node("mcl_core:dirt_with_grass", {
 	_doc_items_longdesc = S("A grass block is dirt with a grass cover. Grass blocks are resourceful blocks which allow the growth of all sorts of plants. They can be turned into farmland with a hoe and turned into grass paths with a shovel. In light, the grass slowly spreads onto dirt nearby. Under an opaque block or a liquid, a grass block may turn back to dirt."),
 	_doc_items_hidden = false,
 	paramtype2 = "color",
-	tiles = {"mcl_core_grass_block_top.png", { name="default_dirt.png", color="white" }},
+	tiles = {"mcl_core_grass_block_top.png", { name="default_dirt.png", color="white" }, { name="mcl_core_grass_block_side.png", color="white" }},
 	overlay_tiles = {"mcl_core_grass_block_top.png", "", {name="mcl_core_grass_block_side_overlay.png", tileable_vertical=false}},
 	palette = "mcl_core_palette_grass.png",
 	palette_index = 0,
@@ -1068,4 +1068,3 @@ if minetest.get_modpath("doc") then
 	doc.add_entry_alias("nodes", "mcl_core:water_source", "nodes", "mcl_core:water_flowing")
 	doc.add_entry_alias("nodes", "mcl_core:lava_source", "nodes", "mcl_core:lava_flowing")
 end
-

tools/Conversion_Table.csv

@@ -164,7 +164,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/blocks,gold_block.png,/mods/ITEMS/mcl_core/textures,default_gold_block.png,,,,,,,
 /assets/minecraft/textures/blocks,gold_block.png,/mods/ITEMS/mclx_stairs/textures,mcl_stairs_gold_block_slab.png,,,,,,,
 /assets/minecraft/textures/items,gold_ingot.png,/mods/ITEMS/mcl_core/textures,default_gold_ingot.png,,,,,,,
-/assets/minecraft/textures/blocks,grass_side.png,/mods/ITEMS/mcl_core/textures,default_grass_side.png,,,,,,,
+/assets/minecraft/textures/blocks,grass_side.png,/mods/ITEMS/mcl_core/textures,mcl_core_grass_block_side.png,,,,,,,
 /assets/minecraft/textures/blocks,gravel.png,/mods/ITEMS/mcl_core/textures,default_gravel.png,,,,,,,
 /assets/minecraft/textures/blocks,ice.png,/mods/ITEMS/mcl_core/textures,default_ice.png,,,,,,,
 /assets/minecraft/textures/blocks,log_jungle.png,/mods/ITEMS/mcl_core/textures,default_jungletree.png,,,,,,,
@@ -973,4 +973,4 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/blocks,grass_top.png,/mods/ITEMS/mcl_core/textures,mcl_core_grass_block_top.png,,,,,,,
 /assets/minecraft/textures/blocks,grass_side_overlay.png,/mods/ITEMS/mcl_core/textures,mcl_core_grass_block_side_overlay.png,,,,,,,
 /assets/minecraft/textures/items,book_enchanted.png,/mods/ITEMS/mcl_enchanting/textures,mcl_enchanting_book_enchanted.png,,,,,,,
-/assets/minecraft/textures/items,experience_bottle.png,/mods/HUD/mcl_experience/textures,mcl_experience_bottle.png,,,,,,,
+/assets/minecraft/textures/items,experience_bottle.png,/mods/HUD/mcl_experience/textures,mcl_experience_bottle.png,,,,,,,