Merge remote-tracking branch 'upstream/master'

* add pane variants of the octagon glass nodes (single, double and offset)
* fix some indent issues
* added dark glass pane

Co-authored-by: BuckarooBanzay <BuckarooBanzay@users.noreply.github.com>

README.md

@@ -4,6 +4,7 @@
 
 ![](https://github.com/D00Med/scifi_nodes/workflows/luacheck/badge.svg)
 ![](https://github.com/D00Med/scifi_nodes/workflows/integration-test/badge.svg)
+[![ContentDB](https://content.minetest.net/packages/D00Med/scifi_nodes/shields/downloads/)](https://content.minetest.net/packages/D00Med/scifi_nodes/)
 
 Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
 

crafts.lua

@@ -1680,7 +1680,7 @@ minetest.register_craft({
 minetest.register_craft({
     output = 'scifi_nodes:stripes2top 3',
     recipe = {
-        {"scifi_nodes:black","scifi_noedes:black","scifi_nodes:black"},
+        {"scifi_nodes:black","scifi_nodes:black","scifi_nodes:black"},
         {"default:silver_sand","default:silver_sand","default:silver_sand"}
     }
 })
@@ -1692,4 +1692,3 @@ minetest.register_craft({
         {"scifi_nodes:stripes"}
     }
 })
-

init.lua

@@ -22,3 +22,5 @@ dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
 dofile(MP.."/crafts.lua")
 dofile(MP.."/octagon_panes.lua")
+
+minetest.log("action", "[scifi_nodes] loaded.")

nodeboxes.lua

@@ -1080,10 +1080,9 @@ minetest.register_node("scifi_nodes:itemholder", {
 		local meta = minetest.get_meta(pos)
 		if name == meta:get_string("owner") or
 				minetest.check_player_privs(name, "protection_bypass") then
-			local wield_item = clicker:get_wielded_item():get_name()
 			local taken = item:take_item()
 			if taken and not taken:is_empty() then
-				minetest.add_item(pos, wield_item)
+				minetest.add_item(pos, taken:to_string())
 				return item
 			end
 		end

octagon_panes.lua

@@ -19,7 +19,7 @@ local function register(basename, description, texture)
     is_ground_content = false,
     node_box = {
       type = "fixed",
-      fixed = {{-0.5, -0.5, 0, 0.5, 0.5, 0}},
+      fixed = {{-0.5, -0.5, -0.03125, 0.5, 0.5, 0.03125}},
     },
     selection_box = {
       type = "fixed",
@@ -44,7 +44,7 @@ local function register(basename, description, texture)
     is_ground_content = false,
     node_box = {
       type = "fixed",
-      fixed = {{-0.5, -0.5, 0, 0.5, 1.5, 0}},
+      fixed = {{-0.5, -0.5, -0.03125, 0.5, 1.5, 0.03125}},
     },
     selection_box = {
       type = "fixed",
@@ -69,7 +69,7 @@ local function register(basename, description, texture)
     is_ground_content = false,
     node_box = {
       type = "fixed",
-      fixed = {{-0.5, -0.5, 1, 0.5, 0.5, 1}},
+      fixed = {{-0.5, -0.5, 0.96875, 0.5, 0.5, 1.03125}},
     },
     selection_box = {
       type = "fixed",