Ethereal NG 1.20 release for minetest 0.4.14

13 files changed, 250 insertions, 313 deletions

diff --git a/schematics/apple_tree.lua b/schematics/apple_tree.lua
deleted file mode 100644
index 3d4dd1c..0000000
--- a/schematics/apple_tree.lua
+++ /dev/null
@@ -1,38 +0,0 @@
-
--- Apple Tree (built column by column, bottom to top)
-
-local i = "air"
-local t = "default:tree"
-local l = "default:leaves"
-local a = "default:apple"
-
-ethereal.appletree = {
-	size = {x=3, y=6, z=3},
-	data = {
-
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=l, param1=223}, {name=l, param1=223}, {name=a, param1=050},
-		{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-		{name=l, param1=223}, {name=a, param1=050}, {name=l, param1=223},
-
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=l, param1=223}, {name=t, param1=255}, {name=i, param1=223},
-		{name=l, param1=255}, {name=t, param1=255}, {name=l, param1=255},
-		{name=l, param1=223}, {name=l, param1=255}, {name=l, param1=223},
-
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=a, param1=050}, {name=l, param1=223}, {name=l, param1=223},
-		{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-		{name=l, param1=223}, {name=l, param1=223}, {name=l, param1=223},
-
-	},
-	yslice_prob = {
-		{ypos=1, prob=127},
-	},
-}
diff --git a/schematics/bamboo_tree.lua b/schematics/bamboo_tree.lua
index a6c825b..13f06f1 100644
--- a/schematics/bamboo_tree.lua
+++ b/schematics/bamboo_tree.lua
@@ -1,73 +1,77 @@
 
--- Bamboo Tree (built column by column, bottom to top)
+-- bamboo stalk with leaves
 
-local i = "air"
-local t = "ethereal:bamboo"
-local l = "ethereal:bamboo_leaves"
+local ai = {name = "air", param1 = 000}
+local bt = {name = "ethereal:bamboo", param1 = 255}
+local lp = {name = "ethereal:bamboo_leaves", param1 = 255}
+local lr = {name = "ethereal:bamboo_leaves", param1 = 100}
 
 ethereal.bambootree = {
-	size = {x=3, y=18, z=3},
+
+	size = {x = 3, y = 18, z = 3},
+
 	data = {
 
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=l, param1=100}, {name=l, param1=255}, {name=l, param1=100},
-		{name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		lr, lp, lr,
+		ai, lp, ai,
+		ai, ai, ai,
 
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=l, param1=100}, {name=l, param1=255}, {name=l, param1=100},
-		{name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=l, param1=127}, {name=i, param1=000},
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		ai, bt, ai,
+		lr, lp, lr,
+		ai, lp, ai,
+		ai, lr, ai,
 
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=l, param1=100}, {name=l, param1=255}, {name=l, param1=100},
-		{name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		lr, lp, lr,
+		ai, lp, ai,
+		ai, ai, ai,
 
 	},
+
 	yslice_prob = {
-		{ypos=3, prob=127},
+		{ypos = 3, prob = 127},
 	},
 }
diff --git a/schematics/banana_tree.lua b/schematics/banana_tree.lua
index 37b727f..194992f 100644
--- a/schematics/banana_tree.lua
+++ b/schematics/banana_tree.lua
@@ -1,80 +1,85 @@
 
--- Banana Tree (built column by column, bottom to top)
+-- banana tree
 
-local i = "air"
-local t = "ethereal:banana_trunk"
-local l = "ethereal:bananaleaves"
-local b = "ethereal:banana"
+local ai = {name = "air", param1 = 000}
+local tr = {name = "ethereal:banana_trunk", param1 = 255}
+local lp = {name = "ethereal:bananaleaves", param1 = 255}
+local lr = {name = "ethereal:bananaleaves", param1 = 180}
+local bp = {name = "ethereal:banana", param1 = 255}
+local br = {name = "ethereal:banana", param1 = 070}
 
 ethereal.bananatree = {
-	size = {x=7, y=8, z=7},
+
+	size = {x = 7, y = 8, z = 7},
+
 	data = {
 
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=l, param1=180}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, lr, ai, ai, ai,
+		ai, ai, ai, lp, ai, ai, ai,
 
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=b, param1=070}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=b, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, br, ai, ai, ai,
+		ai, ai, ai, bp, ai, ai, ai,
+		ai, ai, ai, lp, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
 
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=b, param1=070}, {name=t, param1=255}, {name=b, param1=070}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=b, param1=255}, {name=l, param1=255}, {name=b, param1=255}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=i, param1=000},
-{name=l, param1=255}, {name=l, param1=180}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=l, param1=180}, {name=l, param1=255},
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, br, tr, br, ai, ai,
+		ai, ai, bp, lp, bp, ai, ai,
+		ai, lp, lp, lp, lp, lp, ai,
+		lp, lr, ai, lp, ai, lr, lp,
 
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=b, param1=070}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=b, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		ai, ai, ai, tr, ai, ai, ai,
+		ai, ai, ai, tr, ai, ai, ai,
+		ai, ai, ai, tr, ai, ai, ai,
+		ai, ai, ai, tr, ai, ai, ai,
+		ai, ai, ai, br, ai, ai, ai,
+		ai, ai, ai, bp, ai, ai, ai,
+		ai, ai, ai, lp, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
 
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=l, param1=180}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, lp, ai, ai, ai,
+		ai, ai, ai, lr, ai, ai, ai,
 
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, lp, ai, ai, ai,
 
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai, ai, ai,
 
 	},
+
 	yslice_prob = {
-		{ypos=1, prob=127},
+		{ypos = 1, prob = 127},
 	},
 }
diff --git a/schematics/bananatree.mts b/schematics/bananatree.mts
deleted file mode 100644
index 2149d98..0000000
--- a/schematics/bananatree.mts
+++ /dev/null
diff --git a/schematics/birch_tree.lua b/schematics/birch_tree.lua
index 32894d0..40d326f 100644
--- a/schematics/birch_tree.lua
+++ b/schematics/birch_tree.lua
@@ -1,50 +1,60 @@
 
--- Birch Tree (built column by column, bottom to top)
-
-local i = "air"
-local t = "ethereal:birch_trunk"
-local l = "ethereal:birch_leaves"
-
-ethereal.birchtree = {size = {x = 5, y = 7, z = 5}, data = {
-
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=l, param1=150}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=150},
-{name=l, param1=150}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=150},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-{name=i, param1=000}, {name=l, param1=150}, {name=l, param1=255}, {name=l, param1=150}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000},
-
-{name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000},
-{name=l, param1=255}, {name=l, param1=255}, {name=t, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-{name=l, param1=255}, {name=l, param1=255}, {name=t, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-{name=i, param1=000}, {name=l, param1=255}, {name=t, param1=255}, {name=l, param1=255}, {name=i, param1=000},
-{name=i, param1=000}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=i, param1=000},
-
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-{name=i, param1=000}, {name=l, param1=150}, {name=l, param1=255}, {name=l, param1=150}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000},
-
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=l, param1=150}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=150},
-{name=l, param1=150}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=150},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-
-}, yslice_prob = {{ypos = 1, prob = 127}}}
+-- birch tree
+
+local ai = {name = "air", param1 = 000}
+local tr = {name = "ethereal:birch_trunk", param1 = 255}
+local lp = {name = "ethereal:birch_leaves", param1 = 255}
+local lr = {name = "ethereal:birch_leaves", param1 = 150}
+
+ethereal.birchtree = {
+
+	size = {x = 5, y = 7, z = 5},
+
+	data = {
+
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+		lr, lp, lp, lp, lr,
+		lr, lp, lp, lp, lr,
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+		lp, lp, lp, lp, lp,
+		lp, lp, lp, lp, lp,
+		ai, lr, lp, lr, ai,
+		ai, ai, lp, ai, ai,
+
+		ai, ai, tr, ai, ai,
+		ai, ai, tr, ai, ai,
+		ai, ai, tr, ai, ai,
+		lp, lp, tr, lp, lp,
+		lp, lp, tr, lp, lp,
+		ai, lp, tr, lp, ai,
+		ai, lp, lp, lp, ai,
+
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+		lp, lp, lp, lp, lp,
+		lp, lp, lp, lp, lp,
+		ai, lr, lp, lr, ai,
+		ai, ai, lp, ai, ai,
+
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+		lr, lp, lp, lp, lr,
+		lr, lp, lp, lp, lr,
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
+
+	},
+
+	yslice_prob = {
+		{ypos = 1, prob = 127}
+	},
+}
diff --git a/schematics/bush.lua b/schematics/bush.lua
index 196fe37..1395b06 100644
--- a/schematics/bush.lua
+++ b/schematics/bush.lua
@@ -1,35 +1,39 @@
 
--- Bush (built column by column, bottom to top)
+-- bush
 
-local i = "air"
-local b = "ethereal:bush"
+local ai = {name = "air", param1 = 000}
+local bp = {name = "ethereal:bush", param1 = 255}
+local br = {name = "ethereal:bush", param1 = 100}
 
 ethereal.bush = {
-	size = {x=5, y=3, z=5},
+
+	size = {x = 5, y = 3, z = 5},
+
 	data = {
 
-{name=b, param1=100}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=100},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		br, bp, bp, bp, br,
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
 
-{name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255},
-{name=i, param1=000}, {name=b, param1=100}, {name=b, param1=255}, {name=b, param1=100}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		bp, bp, bp, bp, bp,
+		ai, br, bp, br, ai,
+		ai, ai, ai, ai, ai,
 
-{name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255},
-{name=i, param1=000}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=b, param1=100}, {name=i, param1=000}, {name=i, param1=000},
+		bp, bp, bp, bp, bp,
+		ai, bp, bp, bp, ai,
+		ai, ai, br, ai, ai,
 
-{name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255},
-{name=i, param1=000}, {name=b, param1=100}, {name=b, param1=255}, {name=b, param1=100}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		bp, bp, bp, bp, bp,
+		ai, br, bp, br, ai,
+		ai, ai, ai, ai, ai,
 
-{name=b, param1=100}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=255}, {name=b, param1=100},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
+		br, bp, bp, bp, br,
+		ai, ai, ai, ai, ai,
+		ai, ai, ai, ai, ai,
 
 	},
+
 	yslice_prob = {
-		{ypos=1, prob=127},
+		{ypos = 1, prob = 127},
 	},
 }
diff --git a/schematics/jungletree.mts b/schematics/jungletree.mts
deleted file mode 100644
index a4aaa01..0000000
--- a/schematics/jungletree.mts
+++ /dev/null
diff --git a/schematics/large_cactus.mts b/schematics/large_cactus.mts
deleted file mode 100644
index b71077b..0000000
--- a/schematics/large_cactus.mts
+++ /dev/null
diff --git a/schematics/orange_tree.lua b/schematics/orange_tree.lua
index 27876bf..c7cff9c 100644
--- a/schematics/orange_tree.lua
+++ b/schematics/orange_tree.lua
@@ -1,38 +1,42 @@
 
--- Orange Tree (built column by column, bottom to top)
+-- orange tree
 
-local i = "air"
-local t = "default:tree"
-local l = "ethereal:orange_leaves"
-local o = "ethereal:orange"
+local ai = {name = "air", param1 = 000}
+local lp = {name = "ethereal:orange_leaves", param1 = 255}
+local lr = {name = "ethereal:orange_leaves", param1 = 200}
+local tr = {name = "default:tree", param1 = 255}
+local of = {name = "ethereal:orange", param1 = 100}
 
 ethereal.orangetree = {
-	size = {x=3, y=6, z=3},
+
+	size = {x = 3, y = 6, z = 3},
+
 	data = {
 
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=l, param1=223}, {name=l, param1=223}, {name=o, param1=100},
-		{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-		{name=l, param1=223}, {name=o, param1=100}, {name=l, param1=223},
-
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000},
-		{name=l, param1=223}, {name=t, param1=255}, {name=l, param1=223},
-		{name=l, param1=255}, {name=t, param1=255}, {name=l, param1=255},
-		{name=l, param1=223}, {name=l, param1=255}, {name=l, param1=223},
-
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000},
-		{name=o, param1=100}, {name=l, param1=223}, {name=l, param1=223},
-		{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255},
-		{name=l, param1=223}, {name=l, param1=223}, {name=l, param1=223},
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		lr, lr, of,
+		lp, lp, lp,
+		lr, of, lr,
+
+		ai, tr, ai,
+		ai, tr, ai,
+		ai, tr, ai,
+		lr, tr, lr,
+		lp, tr, lp,
+		lr, lp, lr,
+
+		ai, ai, ai,
+		ai, ai, ai,
+		ai, ai, ai,
+		of, lr, lr,
+		lp, lp, lp,
+		lr, lr, lr,
 
 	},
+
 	yslice_prob = {
-		{ypos=1, prob=127},
+		{ypos = 1, prob = 127},
 	},
 }
diff --git a/schematics/orangetree.mts b/schematics/orangetree.mts
deleted file mode 100644
index 4536dd0..0000000
--- a/schematics/orangetree.mts
+++ /dev/null
diff --git a/schematics/redwood_tree.mts b/schematics/redwood_tree.mts
new file mode 100644
index 0000000..50c367a
--- /dev/null
+++ b/schematics/redwood_tree.mts
diff --git a/schematics/tree.mts b/schematics/tree.mts
deleted file mode 100644
index 4ba4898..0000000
--- a/schematics/tree.mts
+++ /dev/null
diff --git a/schematics/waterlily.lua b/schematics/waterlily.lua
index d6bfaa3..1936b04 100644
--- a/schematics/waterlily.lua
+++ b/schematics/waterlily.lua
@@ -1,69 +1,17 @@
 
--- Waterlily (built column by column, bottom to top)
-
-local a = "default:sand"
-local b = "default:water_source"
-local c = "flowers:waterlily"
+-- waterlily
 
 ethereal.waterlily = {
 	size = {x = 1, y = 3, z = 1},
 	data = {
 
-		{name=a, param1=255},
-		{name=b, param1=255},
-		{name=c, param1=255},
+		{name = "default:sand", param1 = 255},
+		{name = "default:water_source", param1 = 255},
+		{name = "flowers:waterlily", param1 = 255},
 
 	},
 }
 
-if minetest.registered_nodes["flowers:waterlily"] then
-
 minetest.override_item("flowers:waterlily", {
 	walkable = true,
 })
-
-else
-
-minetest.register_node(":flowers:waterlily", {
-	description = "Waterlily",
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	tiles = {"flowers_waterlily.png"},
-	inventory_image = "flowers_waterlily.png",
-	wield_image = "flowers_waterlily.png",
-	liquids_pointable = true,
-	walkable = true,
-	buildable_to = true,
-	groups = {snappy = 3, flower = 1},
-	sounds = default.node_sound_leaves_defaults(),
-	node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.46875, 0.5}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}
-	},
-
-	after_place_node = function(pos, placer, itemstack, pointed_thing)
-		local find_water = minetest.find_nodes_in_area({x = pos.x - 1, y = pos.y, z = pos.z - 1},
-			{x = pos.x + 1, y = pos.y, z = pos.z + 1}, "default:water_source")
-		local find_river_water = minetest.find_nodes_in_area({x = pos.x - 1, y = pos.y, z = pos.z - 1},
-			{x = pos.x + 1, y = pos.y, z = pos.z + 1}, "default:river_water_source")
-		if #find_water ~= 0 then
-			minetest.set_node(pos, {name = "default:water_source"})
-			pos.y = pos.y + 1
-			minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)})
-		elseif #find_river_water ~= 0 then
-			minetest.set_node(pos, {name = "default:river_water_source"})
-			pos.y = pos.y + 1
-			minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)})
-		else
-			minetest.remove_node(pos)
-			return true
-		end
-	end
-})
-
-end