Merge https://github.com/h-v-smacker/technic

10 files changed, 89 insertions, 65 deletions

diff --git a/extranodes/trampoline.lua b/extranodes/trampoline.lua
index 5616a73..8d94a92 100644
--- a/extranodes/trampoline.lua
+++ b/extranodes/trampoline.lua
@@ -35,6 +35,7 @@ minetest.register_node(":technic:fall_dampener_50", {
                "technic_fall_dampener_side.png"},
 	groups = {crumbly = 3, fall_damage_add_percent = -50},
 	sounds = default.node_sound_dirt_defaults(),
+	paramtype = "light",
 	paramtype2 = "facedir",
 })
 
@@ -49,6 +50,7 @@ minetest.register_node(":technic:fall_dampener_100", {
                "technic_fall_dampener_side.png"},
 	groups = {crumbly = 3, fall_damage_add_percent = -100},
 	sounds = default.node_sound_dirt_defaults(),
+	paramtype = "light",
 	paramtype2 = "facedir",
 })
 
@@ -63,6 +65,7 @@ minetest.register_node(":technic:trampoline", {
 		"technic_trampoline_side.png"},
 	groups = {crumbly = 3, bouncy = 100, fall_damage_add_percent = -100},
 	sounds = {footstep = {name = "trampoline_boing", gain = 1.0}},
+	paramtype = "light",
 	paramtype2 = "facedir",
 })
 
diff --git a/technic/init.lua b/technic/init.lua
index 56abfbd..29508c9 100644
--- a/technic/init.lua
+++ b/technic/init.lua
@@ -12,7 +12,7 @@ local modpath = minetest.get_modpath("technic")
 technic.modpath = modpath
 
 -- there should be a way to distinguish this fork from others
-technic.vendorstring = "linuxforks"
+technic.mod = "linuxforks"
 
 -- Boilerplate to support intllib
 if rawget(_G, "intllib") then
diff --git a/technic/machines/LV/cnc_nodes.lua b/technic/machines/LV/cnc_nodes.lua
index 2667383..e16b7f7 100644
--- a/technic/machines/LV/cnc_nodes.lua
+++ b/technic/machines/LV/cnc_nodes.lua
@@ -318,6 +318,15 @@ if minetest.get_modpath("ethereal") then
                 {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1},
                 {"bamboo_floor.png"},
                 S("Bamboo"))
+	
+	-- Shaped hedge bush for gardens and parks
+	-------------------------------------------
+	
+	technic.cnc.register_all("ethereal:bush",
+		{snappy=3, flamable=2, not_in_creative_inventory=1},
+		{"ethereal_bush.png"},
+		S("Bush"))
+	
 end
 
 
diff --git a/technic/machines/register/compressor_recipes.lua b/technic/machines/register/compressor_recipes.lua
index 021c393..3339981 100644
--- a/technic/machines/register/compressor_recipes.lua
+++ b/technic/machines/register/compressor_recipes.lua
@@ -84,4 +84,3 @@ table.insert(recipes, {"vessels:steel_bottle", "technic:lox"})
 for _, data in pairs(recipes) do
 	technic.register_compressor_recipe({input = {data[1]}, output = data[2]})
 end
-
diff --git a/technic/machines/register/grindings.lua b/technic/machines/register/grindings.lua
index 018eed9..3d9a698 100644
--- a/technic/machines/register/grindings.lua
+++ b/technic/machines/register/grindings.lua
@@ -48,11 +48,18 @@ local rubber_tree_planks = moretrees and "moretrees:rubber_tree_planks"
 local default_extract = dye and "dye:brown 2"
 
 local grinding_recipes = {
-	{"Common Tree",	"group:tree",	 			"group:wood",		default_extract },
+-- group-based recipes appear to be not working
+-- 	{"Common Tree",	"group:tree",	 			"group:wood",		default_extract },
+	{"Tree",		"default:tree",	 			"default:wood",		default_extract },
+	{"Acacia",		"default:acacia_tree",	 		"default:acacia_wood",	default_extract },             
+	{"Aspen",		"default:aspen_tree",	 		"default:aspen_wood",	default_extract },
+	{"Jungletree",	"default:jungletree",	 		"default:junglewood",	default_extract },
+	{"Pine",		"default:pine_tree",	 		"default:pine_wood",	default_extract },             
 	{"Rubber Tree",	"moretrees:rubber_tree_trunk",	rubber_tree_planks,	"technic:raw_latex"},
 	{"Rubber Tree",	"moretrees:rubber_tree_trunk_empty",rubber_tree_planks,	"technic:raw_latex"}
 }
 
+		                                       
 for _, data in pairs(grinding_recipes) do
 	register_tree_grinding(unpack(data))
 end
@@ -61,3 +68,4 @@ if moretrees and dye then
 	-- https://en.wikipedia.org/wiki/Catechu ancient brown dye from the wood of acacia trees
 	register_tree_grinding("Acacia", "moretrees:acacia_trunk", "moretrees:acacia_planks", "dye:brown 8")
 end
+
diff --git a/technic/models/technic_opposed_curved_edge.obj b/technic/models/technic_opposed_curved_edge.obj
index ccb4562..0728a8d 100644
--- a/technic/models/technic_opposed_curved_edge.obj
+++ b/technic/models/technic_opposed_curved_edge.obj
@@ -48,6 +48,10 @@ v 0.500000 -0.000000 0.500000
 v 0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 0.000000 -0.500000
+vt 0.000100 0.999900
+vt 0.000100 0.000100
+vt 0.999900 0.000100
+vt 0.999900 0.999900
 vt 0.985658 0.594688
 vt 0.497610 0.497610
 vt 0.995219 0.497610
@@ -154,7 +158,8 @@ vt 1.000000 0.561068
 vt 0.000000 0.561068
 vt 0.000000 0.000000
 vt 1.000000 0.000000
-vt 0.000000 0.000000
+vn 0.0000 -0.7071 0.7071
+vn 0.0000 -0.7071 -0.7071
 vn 1.0000 0.0000 0.0000
 vn -1.0000 0.0000 0.0000
 vn 0.0000 0.0000 0.0000
@@ -176,69 +181,69 @@ vn -0.0000 0.3827 0.9239
 vn -0.0000 0.1951 0.9808
 vn -0.0000 0.0491 0.9988
 vn 0.0000 -0.0000 1.0000
-vn 0.0000 -0.7071 0.7071
 vn -0.7071 0.0000 0.7071
 vn 0.7071 0.0000 0.7071
-vn 0.0000 -0.7071 -0.7071
 usemtl None
+s 1
+f 40/1/1 39/2/2 45/3/2 44/4/1
+usemtl None_NONE
 s off
-f 1/1/1 2/2/1 3/3/1
-f 4/4/1 2/2/1 1/1/1
-f 5/5/1 2/2/1 4/4/1
-f 6/6/1 2/2/1 5/5/1
-f 7/7/1 2/2/1 6/6/1
-f 8/8/1 2/2/1 7/7/1
-f 9/9/1 2/2/1 8/8/1
-f 10/10/1 2/2/1 9/9/1
-f 11/11/1 2/2/1 10/10/1
-f 11/11/1 12/12/1 2/2/1
-f 2/2/1 12/12/1 13/13/1
-f 2/2/1 14/14/1 15/15/1
-f 2/2/1 15/15/1 16/16/1
-f 2/2/1 16/16/1 17/17/1
-f 18/18/2 19/19/2 20/20/2
-f 21/21/1 2/2/1 17/17/1
-f 2/2/1 13/13/1 14/14/1
-f 18/18/2 22/22/2 19/19/2
-f 18/18/2 23/23/2 22/22/2
-f 18/18/2 24/24/2 23/23/2
-f 18/18/2 25/25/2 24/24/2
-f 18/18/2 26/26/2 25/25/2
-f 18/18/2 27/27/2 26/26/2
-f 18/18/2 28/28/2 27/27/2
-f 18/18/2 29/29/2 30/30/2
-f 31/31/2 18/18/2 32/32/2
-f 32/32/2 18/18/2 33/33/2
-f 33/33/2 18/18/2 34/34/2
-f 34/34/2 18/18/2 35/35/2
-f 35/35/2 18/18/2 36/36/2
-f 36/36/2 18/18/2 30/30/2
-f 31/31/2 28/28/2 18/18/2
-f 37/37/2 38/38/2 39/39/2 40/40/2 41/41/2
-f 42/42/1 43/43/1 44/44/1 45/45/1 46/46/1
-f 29/47/3 18/48/3 37/49/3 41/50/3
-f 3/51/3 2/52/3 42/53/3 46/54/3
-f 2/52/3 21/55/3 43/56/3 42/53/3
-f 18/48/3 20/57/3 38/58/3 37/49/3
+f 1/5/3 2/6/3 3/7/3
+f 4/8/3 2/6/3 1/5/3
+f 5/9/3 2/6/3 4/8/3
+f 6/10/3 2/6/3 5/9/3
+f 7/11/3 2/6/3 6/10/3
+f 8/12/3 2/6/3 7/11/3
+f 9/13/3 2/6/3 8/12/3
+f 10/14/3 2/6/3 9/13/3
+f 11/15/3 2/6/3 10/14/3
+f 11/15/3 12/16/3 2/6/3
+f 2/6/3 12/16/3 13/17/3
+f 2/6/3 14/18/3 15/19/3
+f 2/6/3 15/19/3 16/20/3
+f 2/6/3 16/20/3 17/21/3
+f 18/22/4 19/23/4 20/24/4
+f 21/25/3 2/6/3 17/21/3
+f 2/6/3 13/17/3 14/18/3
+f 18/22/4 22/26/4 19/23/4
+f 18/22/4 23/27/4 22/26/4
+f 18/22/4 24/28/4 23/27/4
+f 18/22/4 25/29/4 24/28/4
+f 18/22/4 26/30/4 25/29/4
+f 18/22/4 27/31/4 26/30/4
+f 18/22/4 28/32/4 27/31/4
+f 18/22/4 29/33/4 30/34/4
+f 31/35/4 18/22/4 32/36/4
+f 32/36/4 18/22/4 33/37/4
+f 33/37/4 18/22/4 34/38/4
+f 34/38/4 18/22/4 35/39/4
+f 35/39/4 18/22/4 36/40/4
+f 36/40/4 18/22/4 30/34/4
+f 31/35/4 28/32/4 18/22/4
+f 37/41/4 38/42/4 39/43/4 40/44/4 41/45/4
+f 42/46/3 43/47/3 44/48/3 45/49/3 46/50/3
+f 29/51/5 18/52/5 37/53/5 41/54/5
+f 3/55/5 2/56/5 42/57/5 46/58/5
+f 2/56/5 21/59/5 43/60/5 42/57/5
+f 18/52/5 20/61/5 38/62/5 37/53/5
 s 1
-f 3/59/4 20/60/4 19/61/5 1/62/5
-f 1/62/5 19/61/5 22/63/6 4/64/6
-f 4/64/6 22/63/6 23/65/7 5/66/7
-f 5/66/7 23/65/7 24/67/8 6/68/8
-f 6/69/8 24/70/8 25/71/9 7/72/9
-f 7/72/9 25/71/9 26/73/10 8/74/10
-f 8/74/10 26/73/10 27/75/11 9/76/11
-f 9/76/11 27/75/11 28/77/12 10/78/12
-f 10/79/12 28/80/12 31/81/13 11/82/13
-f 11/82/13 31/81/13 32/83/14 12/84/14
-f 12/84/14 32/83/14 33/85/15 13/86/15
-f 13/86/15 33/85/15 34/87/16 14/88/16
-f 14/89/16 34/90/16 35/91/17 15/92/17
-f 15/92/17 35/91/17 36/93/18 16/94/18
-f 16/94/18 36/93/18 30/95/19 17/96/19
-f 17/96/19 30/95/19 29/97/20 21/98/20
-f 43/99/21 41/100/21 40/101/22 44/102/22
-f 38/103/23 46/104/24 45/105/25 39/106/25
-f 21/55/20 29/47/20 41/50/21 43/56/21
-f 20/57/4 3/51/4 46/54/24 38/58/23
-f 40/101/22 39/107/25 45/105/25 44/44/22
+f 3/63/6 20/64/6 19/65/7 1/66/7
+f 1/66/7 19/65/7 22/67/8 4/68/8
+f 4/68/8 22/67/8 23/69/9 5/70/9
+f 5/70/9 23/69/9 24/71/10 6/72/10
+f 6/73/10 24/74/10 25/75/11 7/76/11
+f 7/76/11 25/75/11 26/77/12 8/78/12
+f 8/78/12 26/77/12 27/79/13 9/80/13
+f 9/80/13 27/79/13 28/81/14 10/82/14
+f 10/83/14 28/84/14 31/85/15 11/86/15
+f 11/86/15 31/85/15 32/87/16 12/88/16
+f 12/88/16 32/87/16 33/89/17 13/90/17
+f 13/90/17 33/89/17 34/91/18 14/92/18
+f 14/93/18 34/94/18 35/95/19 15/96/19
+f 15/96/19 35/95/19 36/97/20 16/98/20
+f 16/98/20 36/97/20 30/99/21 17/100/21
+f 17/100/21 30/99/21 29/101/22 21/102/22
+f 43/103/23 41/104/23 40/105/1 44/106/1
+f 38/107/24 46/108/25 45/109/2 39/110/2
+f 21/59/22 29/51/22 41/54/23 43/60/23
+f 20/61/6 3/55/6 46/58/25 38/62/24
diff --git a/technic/textures/technic_aspen_grindings.png b/technic/textures/technic_aspen_grindings.png
new file mode 100644
index 0000000..c4d2ce1
--- /dev/null
+++ b/technic/textures/technic_aspen_grindings.png
diff --git a/technic/textures/technic_jungletree_grindings.png b/technic/textures/technic_jungletree_grindings.png
new file mode 100644
index 0000000..2c43686
--- /dev/null
+++ b/technic/textures/technic_jungletree_grindings.png
diff --git a/technic/textures/technic_pine_grindings.png b/technic/textures/technic_pine_grindings.png
new file mode 100644
index 0000000..c75ce98
--- /dev/null
+++ b/technic/textures/technic_pine_grindings.png
diff --git a/technic/textures/technic_tree_grindings.png b/technic/textures/technic_tree_grindings.png
new file mode 100644
index 0000000..e17bb69
--- /dev/null
+++ b/technic/textures/technic_tree_grindings.png