Merge remote-tracking branch 'upstream/master'

.github/workflows/luacheck.yml

@@ -0,0 +1,10 @@
+name: luacheck
+on: [push, pull_request]
+jobs:
+  luacheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Luacheck
+        uses: lunarmodules/luacheck@master

.luacheckrc

@@ -0,0 +1,9 @@
+read_globals = {
+	"minetest",
+	"unifieddyes",
+	"default"
+}
+
+globals = {
+	"unifiedbricks"
+}

init.lua

@@ -12,6 +12,11 @@ unifiedbricks.old_static_list = {}
 unifiedbricks.old_static_list_formals = {}
 unifiedbricks.old_colouredstonebrick_list = {}
 
+minetest.register_alias("unifieddyes:white","unifieddyes:white_paint")
+minetest.register_alias("unifieddyes:lightgrey","unifieddyes:lightgrey_paint")
+minetest.register_alias("unifieddyes:grey","unifieddyes:grey_paint")
+minetest.register_alias("unifieddyes:darkgrey","unifieddyes:darkgrey_paint")
+
 local HUES = {
 	"red",
 	"orange",
@@ -31,13 +36,6 @@ local HUES = {
 	"lightgrey",
 	"white"
 }
-local TYPES = {
-	"clayblock_",
-	"clay_",
-	"brick_",
-	"brickblock_",
-	"multicolor_"
-}
 local SATURATION = {
 	"_s50",
 	""
@@ -68,13 +66,6 @@ local FORMALHUES = {
 	"Light grey",
 	"White"
 }
-local FORMALTYPES = {
-	" clay",
-	" clay lump",
-	" brick",
-	" bricks",
-	" multicolor bricks"
-}
 local FORMALSATURATION = {
 	" (low saturation)",
 	""
@@ -190,7 +181,7 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_dark", {
 		"unifiedbricks_brickblock_multicolor_dark.png"
 	},
 	overlay_tiles = {
-		{ name = "unifiedbricks_mortar2.png", color = "white" }
+		{ name = "unifiedbricks_mortar.png", color = "white" }
 	},
 	paramtype = "light",
 	paramtype2 = "color",
@@ -225,7 +216,7 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_medium", {
 		"unifiedbricks_brickblock_multicolor_medium.png"
 	},
 	overlay_tiles = {
-		{ name = "unifiedbricks_mortar3.png", color = "white" }
+		{ name = "unifiedbricks_mortar.png", color = "white" }
 	},
 	paramtype = "light",
 	paramtype2 = "color",
@@ -260,7 +251,7 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_light", {
 		"unifiedbricks_brickblock_multicolor_light.png"
 	},
 	overlay_tiles = {
-		{ name = "unifiedbricks_mortar4.png", color = "white" }
+		{ name = "unifiedbricks_mortar.png", color = "white" }
 	},
 	paramtype = "light",
 	paramtype2 = "color",
@@ -567,8 +558,8 @@ end
 for i = 1,17 do
 	for j = 1,4 do
 		if i > 12 then
-			formalname = FORMALHUES[i]
-			name = HUES[i]
+			local formalname = FORMALHUES[i]
+			local name = HUES[i]
 			if j == 1 then
 				unifiedbricks.register_old_static_block(name, formalname, "clayblock")
 			elseif j == 4 then
@@ -576,6 +567,7 @@ for i = 1,17 do
 			end
 		else
 			for k = 1,4 do
+				local formalname, name
 				if k == 4 then
 					formalname = FORMALDARKNESS[k] .. FORMALHUES[i]
 					name = DARKNESS[k] .. HUES[i]

mod.conf

@@ -1,5 +1,3 @@
 name = unifiedbricks
-title = Unified Bricks
 description = This mod allows the user to re-color default bricks using Unified Dyes, and provides some pattern variations as well.
-depends = default,unifieddyes
-optional_depends = moreblocks
+depends = default, bucket, unifieddyes, vessels