Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mergeconflicts

Browse source
This commit is contained in:
Milan* 2016-12-15 18:03:31 +00:00
commit 960a9de9d8
188 changed files with 5137 additions and 1518 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mods/nyancat/init.lua
View file

@ -2,6 +2,8 @@ minetest.register_node("nyancat:nyancat", {
description = "Nyan Cat",
tiles = {"nyancat_side.png", "nyancat_side.png", "nyancat_side.png",
"nyancat_side.png", "nyancat_back.png", "nyancat_front.png"},
paramtype = "light",
light_source = default.LIGHT_MAX,
paramtype2 = "facedir",
groups = {cracky = 2},
is_ground_content = false,
@ -16,6 +18,8 @@ minetest.register_node("nyancat:nyancat_rainbow", {
"nyancat_rainbow.png^[transformR90",
"nyancat_rainbow.png"
},
paramtype = "light",
light_source = default.LIGHT_MAX,
paramtype2 = "facedir",
groups = {cracky = 2},
is_ground_content = false,