Merge branch 'tobyplowy-master'

3d_armor_stand/LICENSE.txt

@@ -3,5 +3,20 @@
 
 License Source Code: (C) 2016-2017 Stuart Jones - LGPL v2.1
 
-Lecense Media: (C) 2016-2017 Stuart Jones - CC BY-SA 3.0
+Lecense Models: (C) 2016-2017 Stuart Jones - CC BY-SA 3.0
 
+UV model mapping by tobyplowy(aka toby109tt)
+
+License Textures:
+
+3d_armor_stand.png
+3d_armor_stand_locked.png
+
+(C) 2017 tobyplowy - CC BY-SA 3.0
+
+3d_armor_stand_feet.png
+3d_armor_stand_head.png
+3d_armor_stand_legs.png
+3d_armor_stand_torso.png
+
+(C) 2016-2017 Stuart Jones - CC BY-SA 3.0

3d_armor_stand/init.lua

@@ -102,7 +102,7 @@ minetest.register_node("3d_armor_stand:armor_stand", {
 	description = "Armor stand",
 	drawtype = "mesh",
 	mesh = "3d_armor_stand.obj",
-	tiles = {"default_wood.png", "default_steel_block.png"},
+	tiles = {"3d_armor_stand.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	walkable = false,
@@ -169,7 +169,7 @@ minetest.register_node("3d_armor_stand:locked_armor_stand", {
 	description = "Locked Armor stand",
 	drawtype = "mesh",
 	mesh = "3d_armor_stand.obj",
-	tiles = {"default_wood.png", "default_steel_block.png"},
+	tiles = {"3d_armor_stand_locked.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	walkable = false,

3d_armor_stand/models/3d_armor_stand.obj

@@ -1,191 +1,280 @@
-# Blender v2.73 (sub 0) OBJ File: '3d_armor_stand.blend'
+# Blender v2.72 (sub 0) OBJ File: ''
 # www.blender.org
 mtllib 3d_armor_stand.mtl
-o Player_Cube
-v 0.062500 1.312500 -0.062500
-v 0.062500 1.312500 0.062500
-v -0.062500 1.312500 -0.062500
-v -0.062500 1.312500 0.062500
-v -0.187500 -0.437504 0.062500
-v -0.187500 -0.437504 -0.062500
-v -0.187500 0.937500 0.062500
-v -0.187500 0.937500 -0.062500
-v -0.250000 0.250000 0.062500
-v -0.250000 0.250000 -0.062500
-v -0.250000 0.125003 0.062500
-v -0.250000 0.125003 -0.062500
-v 0.250000 0.250000 0.062500
-v 0.250000 0.250000 -0.062500
-v 0.250000 0.125003 0.062500
-v 0.250000 0.125003 -0.062500
-v -0.062500 -0.437504 -0.062500
-v -0.062500 -0.437504 0.062500
-v -0.062500 0.937500 0.062500
-v -0.062500 0.937500 -0.062500
-v 0.062500 0.250000 0.062500
-v 0.062500 0.250000 -0.062500
-v 0.187500 0.250000 -0.062500
-v 0.187500 0.250000 0.062500
-v 0.187500 0.937500 -0.062500
-v 0.187500 0.937500 0.062500
-v 0.187500 -0.437504 -0.062500
-v 0.187500 -0.437504 0.062500
-v 0.062500 -0.437504 -0.062500
-v 0.062500 -0.437504 0.062500
-v 0.062500 0.937500 0.062500
-v 0.062500 0.937500 -0.062500
-v -0.062500 0.812500 -0.062500
-v -0.187500 0.812500 -0.062500
-v -0.062500 0.812500 0.062500
-v -0.187500 0.812500 0.062500
-v 0.062500 0.812500 -0.062500
-v 0.187500 0.812500 -0.062500
-v 0.187500 0.812500 0.062500
-v 0.062500 0.812500 0.062500
-v 0.375000 0.812500 0.062500
-v 0.375000 0.812500 -0.062500
-v 0.375000 0.937500 0.062500
-v 0.375000 0.937500 -0.062500
-v 0.500000 -0.437500 -0.500000
-v 0.500000 -0.437500 0.500000
+o Armor_Stand_Player_Cube_Stand
+v 0.062500 0.125002 -0.062500
+v 0.062500 -0.437500 -0.062500
+v 0.062500 -0.437500 0.062500
+v 0.062500 0.125002 0.062500
+v -0.187500 0.250004 0.062500
+v -0.187500 0.250004 -0.062500
+v -0.250000 0.250004 -0.062500
+v -0.250000 0.250004 0.062500
+v -0.062500 -0.437500 -0.062500
+v -0.062500 -0.437500 0.062500
+v -0.187500 -0.437500 0.062500
+v -0.187500 -0.437500 -0.062500
+v -0.187500 0.125002 0.062500
+v -0.187500 0.125002 -0.062500
+v -0.187500 0.937504 0.062500
+v -0.187500 0.937504 -0.062500
+v -0.375000 0.937504 -0.062500
+v -0.375000 0.937504 0.062500
+v -0.062500 0.125002 0.062500
+v 0.187500 0.125002 -0.062500
+v 0.187500 -0.437500 -0.062500
+v -0.062500 0.125002 -0.062500
+v -0.250000 0.125007 -0.062500
+v -0.250000 0.125007 0.062500
+v 0.187500 -0.437500 0.062500
+v 0.187500 0.125002 0.062500
+v -0.062500 0.937504 0.062500
+v -0.187500 0.812504 0.062500
+v -0.062500 0.812504 0.062500
+v -0.062500 0.937504 -0.062500
+v 0.187500 0.250004 -0.062500
+v 0.187500 0.250004 0.062500
+v 0.250000 0.250004 0.062500
+v 0.250000 0.250004 -0.062500
+v 0.250000 0.125007 0.062500
+v 0.250000 0.125007 -0.062500
+v 0.187500 0.812504 0.062500
+v 0.187500 0.812504 -0.062500
+v 0.375000 0.812504 -0.062500
+v 0.375000 0.812504 0.062500
+v 0.187500 0.937504 -0.062500
+v 0.187500 0.937504 0.062500
+v 0.375000 0.937504 0.062500
+v 0.375000 0.937504 -0.062500
+v 0.062500 0.937504 -0.062500
+v 0.062500 0.937504 0.062500
+v -0.062500 0.812504 -0.062500
+v -0.187500 0.812504 -0.062500
+v 0.062500 0.812504 -0.062500
+v 0.062500 0.812504 0.062500
+v -0.375000 0.812504 -0.062500
+v -0.375000 0.812504 0.062500
+v -0.062500 0.250004 0.062500
+v 0.062500 0.250004 0.062500
+v 0.062500 0.250004 -0.062500
+v -0.062500 0.250004 -0.062500
+v -0.062500 1.312504 -0.062500
+v 0.062500 1.312504 -0.062500
+v -0.062500 1.312504 0.062500
+v 0.062500 1.312504 0.062500
 v -0.500000 -0.437500 -0.500000
 v -0.500000 -0.437500 0.500000
-v -0.062500 0.250000 -0.062500
-v -0.187500 0.250000 -0.062500
-v -0.062500 0.250000 0.062500
-v -0.187500 0.250000 0.062500
-v -0.375000 0.937500 0.062500
-v -0.375000 0.937500 -0.062500
-v -0.375000 0.812500 -0.062500
-v -0.375000 0.812500 0.062500
+v 0.500000 -0.437500 0.500000
+v 0.500000 -0.437500 -0.500000
+v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
 v -0.500000 -0.500000 0.500000
-v 0.187500 0.124998 0.062500
-v 0.187500 0.124998 -0.062500
-v 0.062500 0.124998 0.062500
-v 0.062500 0.124998 -0.062500
-v -0.062500 0.124998 -0.062500
-v -0.187500 0.124998 -0.062500
-v -0.062500 0.124998 0.062500
-v -0.187500 0.124998 0.062500
-vt 0.000000 0.000000
-vt 0.875000 0.000000
-vt 0.875000 0.250000
-vt 0.000000 0.250000
-vt 0.125000 0.500000
-vt 0.125000 0.750000
-vt -0.000000 0.750000
-vt -0.000000 0.500000
-vt 0.750000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.250000
-vt 0.750000 0.250000
-vt 0.375000 0.500000
-vt 0.375000 0.750000
-vt 0.875000 0.750000
-vt 0.875000 1.000000
-vt 0.000000 1.000000
-vt 0.875000 0.500000
-vt 0.750000 0.500000
-vt 1.000000 0.500000
-vt 1.000000 0.750000
-vt 0.750000 0.750000
-vt 0.625000 1.000000
-vt 0.375000 1.000000
-vt 0.625000 0.750000
-vt 0.625000 0.500000
-vt 0.250000 0.500000
-vt 0.250000 0.750000
-vt 0.625000 0.250000
-vt 0.625000 -0.000000
-vt 0.250000 0.250000
-vt 0.250000 0.000000
-vt 0.375000 0.250000
-vt 0.250000 1.000000
-vt 1.000000 1.000000
-vt 0.750000 1.000000
-vt 0.375000 -0.000000
-vt 0.125000 0.250000
-vt 0.125000 1.000000
-vt 0.125000 0.000000
-vt -0.000000 0.937500
-vt 1.000000 0.937500
-vt 0.937500 0.000000
-vt 0.937500 1.000000
-vt 1.000000 0.062500
-vt 0.000000 0.062500
+vt 0.062500 0.140625
 vt 0.062500 0.000000
-vt 0.062500 1.000000
-g Player_Cube_Stand
+vt 0.093750 0.000000
+vt 0.093750 0.140625
+vt 0.140625 0.234375
+vt 0.140625 0.203125
+vt 0.156250 0.203125
+vt 0.156250 0.234375
+vt 0.093750 0.171875
+vt 0.062500 0.171875
+vt 0.218750 0.140625
+vt 0.187500 0.140625
+vt 0.187500 0.000000
+vt 0.218750 0.000000
+vt 0.078125 0.437500
+vt 0.078125 0.468750
+vt 0.031250 0.468750
+vt 0.031250 0.437500
+vt 0.250000 0.140625
+vt 0.250000 0.000000
+vt 0.031250 0.140625
+vt 0.031250 0.000000
+vt 0.156250 0.140625
+vt 0.156250 0.000000
+vt 0.187500 0.203125
+vt 0.156250 0.171875
+vt 0.187500 0.171875
+vt 0.125000 0.000000
+vt 0.125000 0.140625
+vt 0.000000 0.140625
+vt 0.000000 0.000000
+vt 0.328125 0.437500
+vt 0.296875 0.437500
+vt 0.296875 0.406250
+vt 0.328125 0.406250
+vt 0.109375 0.437500
+vt 0.109375 0.468750
+vt 0.046875 0.203125
+vt 0.046875 0.234375
+vt 0.031250 0.234375
+vt 0.031250 0.203125
+vt 0.000000 0.203125
+vt 0.000000 0.171875
+vt 0.031250 0.171875
+vt 0.265625 0.468750
+vt 0.265625 0.437500
+vt 0.218750 0.437500
+vt 0.218750 0.468750
+vt 0.218750 0.171875
+vt 0.171875 0.468750
+vt 0.171875 0.437500
+vt 0.078125 0.406250
+vt 0.031250 0.406250
+vt 0.140625 0.468750
+vt 0.140625 0.437500
+vt 0.140625 0.406250
+vt 0.171875 0.406250
+vt 0.109375 0.406250
+vt 0.359375 0.437500
+vt 0.359375 0.406250
+vt 0.390625 0.406250
+vt 0.390625 0.437500
+vt 0.437500 0.406250
+vt 0.437500 0.437500
+vt 0.000000 0.437500
+vt 0.000000 0.406250
+vt 0.250000 0.437500
+vt 0.218750 0.406250
+vt 0.250000 0.406250
+vt 0.359375 0.468750
+vt 0.406250 0.468750
+vt 0.406250 0.437500
+vt 0.109375 0.234375
+vt 0.078125 0.234375
+vt 0.078125 0.203125
+vt 0.109375 0.203125
+vt 0.062500 0.468750
+vt 0.062500 0.562500
+vt 0.031250 0.562500
+vt 0.328125 0.468750
+vt 0.296875 0.468750
+vt 0.062500 0.593750
+vt 0.031250 0.593750
+vt 0.093750 0.468750
+vt 0.093750 0.562500
+vt 0.125000 0.468750
+vt 0.125000 0.562500
+vt 0.000000 0.562500
+vt 0.000000 0.468750
+vt 0.078125 0.171875
+vt 0.046875 0.171875
+vt 0.265625 0.203125
+vt 0.265625 0.171875
+vt 0.296875 0.171875
+vt 0.296875 0.203125
+vt 0.265625 0.234375
+vt 0.281250 0.234375
+vt 0.281250 0.203125
+vt 0.312500 0.171875
+vt 0.312500 0.203125
+vt 0.140625 0.171875
+vt 0.171875 0.234375
+vt 0.171875 0.203125
+vt 0.109375 0.171875
+vt 0.234375 0.203125
+vt 0.203125 0.203125
+vt 0.203125 0.171875
+vt 0.234375 0.171875
+vt 0.234375 0.234375
+vt 0.203125 0.234375
+vt 0.062500 0.375000
+vt 0.062500 0.234375
+vt 0.093750 0.234375
+vt 0.093750 0.375000
+vt 0.031250 0.375000
+vt 0.125000 0.234375
+vt 0.125000 0.375000
+vt 0.000000 0.375000
+vt 0.000000 0.234375
+vt 0.218750 0.375000
+vt 0.187500 0.375000
+vt 0.187500 0.234375
+vt 0.218750 0.234375
+vt 0.250000 0.375000
+vt 0.250000 0.234375
+vt 0.156250 0.375000
+vt 0.250000 1.000000
+vt 0.250000 0.750000
+vt 0.500000 0.750000
+vt 0.500000 1.000000
+vt 0.750000 0.750000
+vt 0.750000 1.000000
+vt 0.750000 0.734375
+vt 1.000000 0.734375
+vt 1.000000 0.750000
+vt 0.000000 0.750000
+vt 0.000000 0.734375
+vt 0.250000 0.734375
+vt 0.500000 0.734375
 usemtl Stand
 s off
-f 64/1 29/2 30/3 63/4
-f 52/5 50/6 10/7 9/8
-f 17/9 18/10 5/11 6/12
-f 68/3 66/2 6/1 5/4
-f 7/13 8/14 54/7 53/8
-f 67/15 68/16 5/17 18/7
-f 62/4 27/3 29/18 64/8
-f 66/3 65/18 17/8 6/4
-f 9/19 10/20 12/21 11/22
-f 63/7 30/15 28/16 61/17
-f 65/18 67/15 18/7 17/8
-f 61/8 28/18 27/15 62/7
-f 19/23 7/24 36/14 35/25
-f 8/14 7/13 19/26 20/25
-f 23/15 24/18 13/20 14/21
-f 13/8 15/27 16/28 14/7
-f 39/29 38/30 42/10 41/11
-f 29/31 27/4 28/1 30/32
-f 25/28 26/27 43/26 44/25
-f 38/12 25/19 44/13 42/33
-f 25/28 32/7 31/8 26/27
-f 8/26 20/13 33/33 34/29
-f 25/19 38/12 37/11 32/20
-f 31/17 40/7 39/28 26/34
-f 26/34 39/28 41/25 43/23
-f 43/7 41/28 42/34 44/17
-f 53/22 54/21 55/35 56/36
-f 36/14 7/24 53/17 56/7
-f 8/26 34/29 55/11 54/20
-f 34/37 36/33 56/4 55/1
-f 51/13 21/26 22/25 49/14
-f 20/4 3/12 1/19 32/8
-f 40/15 31/16 19/23 35/25
-f 35/29 33/30 37/2 40/3
-f 33/33 20/13 32/5 37/38
-f 3/14 4/24 2/23 1/25
-f 19/12 4/4 3/1 20/9
-f 31/36 2/17 4/7 19/22
-f 32/22 1/7 2/8 31/19
-f 23/5 62/38 64/33 22/13
-f 21/14 63/24 61/39 24/6
-f 61/3 62/2 16/10 15/11
-f 62/38 23/5 14/8 16/4
-f 24/6 61/39 15/17 13/7
-f 50/18 66/3 12/11 10/20
-f 66/40 68/38 11/4 12/1
-f 50/18 49/26 65/29 66/3
-f 51/25 52/15 68/16 67/23
-f 68/16 52/15 9/21 11/35
-f 49/26 22/13 64/33 65/29
-f 51/25 67/23 63/24 21/14
-f 67/33 65/37 64/30 63/29
-f 37/1 22/2 21/3 40/4
-f 38/4 23/3 22/18 37/8
-f 40/7 21/15 24/16 39/17
-f 39/8 24/18 23/15 38/7
-f 36/2 34/3 50/4 52/1
-f 35/15 36/16 52/17 51/7
-f 34/3 33/18 49/8 50/4
-f 33/18 35/15 51/7 49/8
-g Player_Cube_Base
+f 1/1 2/2 3/3 4/4
+f 5/5 6/6 7/7 8/8
+f 9/1 10/4 11/9 12/10
+f 13/11 14/12 12/13 11/14
+f 15/15 16/16 17/17 18/18
+f 19/19 13/11 11/14 10/20
+f 2/2 1/1 20/21 21/22
+f 14/12 22/23 9/24 12/13
+f 8/25 7/7 23/26 24/27
+f 4/4 3/3 25/28 26/29
+f 22/23 19/29 10/28 9/24
+f 26/30 25/31 21/22 20/21
+f 27/32 15/33 28/34 29/35
+f 16/16 15/15 27/36 30/37
+f 31/38 32/39 33/40 34/41
+f 33/42 35/43 36/44 34/41
+f 37/45 38/46 39/47 40/48
+f 2/49 21/27 25/12 3/11
+f 41/50 42/51 43/47 44/48
+f 38/52 41/15 44/18 39/53
+f 41/50 45/54 46/55 42/51
+f 16/51 30/55 47/56 48/57
+f 41/15 38/52 49/58 45/36
+f 46/59 50/60 37/61 42/62
+f 42/62 37/61 40/63 43/64
+f 43/65 40/66 39/53 44/18
+f 18/67 17/47 51/68 52/69
+f 28/34 15/33 18/67 52/69
+f 16/51 48/57 51/68 17/47
+f 48/59 28/70 52/71 51/72
+f 53/73 54/74 55/75 56/76
+f 30/77 57/78 58/79 45/17
+f 50/60 46/59 27/32 29/35
+f 29/80 47/32 49/33 50/81
+f 47/56 30/55 45/36 49/58
+f 57/78 59/82 60/83 58/79
+f 27/84 59/85 57/78 30/77
+f 46/86 60/87 59/85 27/84
+f 45/17 58/79 60/88 46/89
+f 1/90 55/75 31/38 20/91
+f 54/92 4/93 26/94 32/95
+f 26/92 20/96 36/97 35/98
+f 20/91 31/38 34/41 36/44
+f 32/95 26/94 35/99 33/100
+f 6/6 14/101 23/26 7/7
+f 14/102 13/103 24/7 23/8
+f 6/6 56/76 22/104 14/101
+f 53/105 5/106 13/107 19/108
+f 13/107 5/106 8/25 24/27
+f 1/90 22/104 56/76 55/75
+f 53/105 19/108 4/93 54/92
+f 1/109 4/105 19/106 22/110
+f 49/111 55/112 54/113 50/114
+f 38/115 31/40 55/112 49/111
+f 50/114 54/113 32/116 37/117
+f 37/118 32/119 31/40 38/115
+f 28/120 48/121 6/122 5/123
+f 29/124 28/120 5/123 53/125
+f 48/121 47/126 56/8 6/122
+f 47/126 29/117 53/116 56/8
 usemtl Base
-f 47/17 48/1 46/10 45/35
-f 59/1 57/10 58/35 60/17
-f 48/17 60/41 58/42 46/35
-f 46/43 58/10 57/35 45/44
-f 47/1 45/10 57/45 59/46
-f 48/47 47/48 59/17 60/1
+f 61/127 62/128 63/129 64/130
+f 65/129 66/131 67/132 68/130
+f 62/131 68/133 67/134 63/135
+f 63/136 67/137 66/138 64/128
+f 61/129 64/128 66/138 65/139
+f 62/131 61/129 65/139 68/133