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

fix mergeconflicts

Browse source 
readd submodule boats+farming
This commit is contained in:
Milan* 2016-12-15 18:54:08 +00:00
commit 4f4ceb66a2
188 changed files with 5142 additions and 1513 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mods/default/craftitems.lua
View file

@ -8,12 +8,13 @@ minetest.register_craftitem("default:bone", {
minetest.register_craftitem("default:stick", {
description = "Stick",
inventory_image = "default_stick.png",
groups = {stick = 1},
groups = {stick = 1, flammable = 2},
})
minetest.register_craftitem("default:paper", {
description = "Paper",
inventory_image = "default_paper.png",
groups = {flammable = 3},
})
local lpp = 14 -- Lines per book's page
@ -110,7 +111,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
elseif fields.book_next or fields.book_prev then
local data = minetest.deserialize(stack:get_metadata())
if not data.page then return end
if not data or not data.page then
return
end
if fields.book_next then
data.page = data.page + 1
@ -135,14 +138,14 @@ end)
minetest.register_craftitem("default:book", {
description = "Book",
inventory_image = "default_book.png",
groups = {book = 1},
groups = {book = 1, flammable = 3},
on_use = book_on_use,
})
minetest.register_craftitem("default:book_written", {
description = "Book With Text",
inventory_image = "default_book_written.png",
groups = {book = 1, not_in_creative_inventory = 1},
groups = {book = 1, not_in_creative_inventory = 1, flammable = 3},
stack_max = 1,
on_use = book_on_use,
})
@ -179,7 +182,7 @@ end)
minetest.register_craftitem("default:coal_lump", {
description = "Coal Lump",
inventory_image = "default_coal_lump.png",
groups = {coal = 1}
groups = {coal = 1, flammable = 1}
})
minetest.register_craftitem("default:iron_lump", {