resolve mergeconflicts

This commit is contained in:
Milan Ihl 2020-08-17 22:07:15 +02:00
commit 029ab5aa0c
488 changed files with 9848 additions and 2154 deletions

View file

@ -1,5 +1,11 @@
-- screwdriver/init.lua
screwdriver = {}
-- Load support for MT game translation.
local S = minetest.get_translator("screwdriver")
screwdriver.ROTATE_FACE = 1
screwdriver.ROTATE_AXIS = 2
screwdriver.disallow = function(pos, node, user, mode, new_param2)
@ -144,8 +150,9 @@ end
-- Screwdriver Steel
minetest.register_tool("screwdriver:screwdriver", {
description = "Screwdriver (left-click rotates face, right-click rotates axis)",
description = S("Screwdriver") .. "\n" .. S("(left-click rotates face, right-click rotates axis)"),
inventory_image = "screwdriver.png",
groups = {tool = 1},
on_use = function(itemstack, user, pointed_thing)
screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE, 200)
return itemstack