Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering

# Conflicts:
#	src/main/java/appeng/decorative/solid/BlockQuartzGlass.java

#	src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json
# Changed naming convention.
This commit is contained in:
elix-x
2016-08-19 12:49:25 +02:00
57 changed files with 2566 additions and 168 deletions
@@ -0,0 +1,7 @@
{
"variants": {
"normal": {
"model": "appliedenergistics2:builtin/connected_glass"
}
}
}
@@ -0,0 +1,48 @@
{
"variants": {
"facing=down,odd=false": {
"model": "appliedenergistics2:quartz_torch_standing",
"x": 180
},
"facing=down,odd=true": {
"model": "appliedenergistics2:quartz_torch_standing_odd",
"x": 180
},
"facing=east,odd=false": {
"model": "appliedenergistics2:quartz_torch_wall",
"y": 90
},
"facing=east,odd=true": {
"model": "appliedenergistics2:quartz_torch_wall_odd",
"y": 90
},
"facing=north,odd=false": {
"model": "appliedenergistics2:quartz_torch_wall"
},
"facing=north,odd=true": {
"model": "appliedenergistics2:quartz_torch_wall_odd"
},
"facing=south,odd=false": {
"model": "appliedenergistics2:quartz_torch_wall",
"y": 180
},
"facing=south,odd=true": {
"model": "appliedenergistics2:quartz_torch_wall_odd",
"y": 180
},
"facing=up,odd=false": {
"model": "appliedenergistics2:quartz_torch_standing"
},
"facing=up,odd=true": {
"model": "appliedenergistics2:quartz_torch_standing_odd"
},
"facing=west,odd=false": {
"model": "appliedenergistics2:quartz_torch_wall",
"y": 270
},
"facing=west,odd=true": {
"model": "appliedenergistics2:quartz_torch_wall_odd",
"y": 270
}
}
}
@@ -0,0 +1,305 @@
{
"elements": [
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
3.0,
6.0
],
"name": "Middle Plate",
"to": [
10.0,
4.0,
10.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
1.0,
7.0
],
"name": "Lower Quartz Block",
"to": [
9.0,
3.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
0.0,
7.0
],
"name": "Lower Quartz Tip",
"to": [
8.0,
1.0,
8.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
4.0,
7.0
],
"name": "Upper Quartz Block",
"to": [
9.0,
6.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
8.0,
6.0,
8.0
],
"name": "Upper Quartz Tip",
"to": [
9.0,
7.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
0.0,
6.0
],
"name": "NW Feet",
"to": [
7.0,
3.0,
7.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
0.0,
9.0
],
"name": "NE Feet",
"to": [
7.0,
3.0,
10.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
9.0,
0.0,
6.0
],
"name": "SW Feet",
"to": [
10.0,
3.0,
7.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
9.0,
0.0,
9.0
],
"name": "SE Feet",
"to": [
10.0,
3.0,
10.0
]
}
],
"textures": {
"metal": "appliedenergistics2:blocks/quartz_torch_metal",
"quartz": "appliedenergistics2:blocks/quartz_torch"
}
}
@@ -0,0 +1,305 @@
{
"elements": [
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
3.0,
6.0
],
"name": "Middle Plate",
"to": [
10.0,
4.0,
10.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
1.0,
7.0
],
"name": "Lower Quartz Block",
"to": [
9.0,
3.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
8.0,
0.0,
8.0
],
"name": "Lower Quartz Tip",
"to": [
9.0,
1.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
4.0,
7.0
],
"name": "Upper Quartz Block",
"to": [
9.0,
6.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
6.0,
7.0
],
"name": "Upper Quartz Tip",
"to": [
8.0,
7.0,
8.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
0.0,
6.0
],
"name": "NW Feet",
"to": [
7.0,
3.0,
7.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
0.0,
9.0
],
"name": "NE Feet",
"to": [
7.0,
3.0,
10.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
9.0,
0.0,
6.0
],
"name": "SW Feet",
"to": [
10.0,
3.0,
7.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
9.0,
0.0,
9.0
],
"name": "SE Feet",
"to": [
10.0,
3.0,
10.0
]
}
],
"textures": {
"metal": "appliedenergistics2:blocks/quartz_torch_metal",
"quartz": "appliedenergistics2:blocks/quartz_torch"
}
}
@@ -0,0 +1,207 @@
{
"ambientocclusion": false,
"elements": [
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
7.0,
7.0,
14.0
],
"name": "Connecting Strut",
"to": [
8.0,
8.0,
16.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
7.0,
10.0
],
"name": "Middle Plate",
"to": [
10.0,
8.0,
14.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
5.0,
11.0
],
"name": "Lower Quartz Block",
"to": [
9.0,
7.0,
13.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
4.0,
11.0
],
"name": "Lower Quartz Tip",
"to": [
8.0,
5.0,
12.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
8.0,
11.0
],
"name": "Upper Quartz Block",
"to": [
9.0,
10.0,
13.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
8.0,
10.0,
12.0
],
"name": "Upper Quartz Tip",
"to": [
9.0,
11.0,
13.0
]
}
],
"textures": {
"metal": "appliedenergistics2:blocks/quartz_torch_metal",
"quartz": "appliedenergistics2:blocks/quartz_torch"
}
}
@@ -0,0 +1,207 @@
{
"ambientocclusion": false,
"elements": [
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
7.0,
7.0,
14.0
],
"name": "Connecting Strut",
"to": [
8.0,
8.0,
16.0
]
},
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
7.0,
10.0
],
"name": "Middle Plate",
"to": [
10.0,
8.0,
14.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
5.0,
11.0
],
"name": "Lower Quartz Block",
"to": [
9.0,
7.0,
13.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
8.0,
4.0,
12.0
],
"name": "Lower Quartz Tip",
"to": [
9.0,
5.0,
13.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
8.0,
11.0
],
"name": "Upper Quartz Block",
"to": [
9.0,
10.0,
13.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
10.0,
11.0
],
"name": "Upper Quartz Tip",
"to": [
8.0,
11.0,
12.0
]
}
],
"textures": {
"metal": "appliedenergistics2:blocks/quartz_torch_metal",
"quartz": "appliedenergistics2:blocks/quartz_torch"
}
}
@@ -0,0 +1,3 @@
{
"parent": "appliedenergistics2:block/EnergyCell/creative_energy_cell"
}
@@ -0,0 +1,3 @@
{
"parent": "builtin/missing"
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:items/quartz_glass"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:items/quartz_glass"
}
}
@@ -0,0 +1,174 @@
{
"elements": [
{
"faces": {
"down": {
"texture": "#metal"
},
"east": {
"texture": "#metal"
},
"north": {
"texture": "#metal"
},
"south": {
"texture": "#metal"
},
"up": {
"texture": "#metal"
},
"west": {
"texture": "#metal"
}
},
"from": [
6.0,
8.0,
6.0
],
"name": "Middle Plate",
"to": [
10.0,
9.0,
10.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
6.0,
7.0
],
"name": "Lower Quartz Block",
"to": [
9.0,
8.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
8.0,
5.0,
7.0
],
"name": "Lower Quartz Tip",
"to": [
9.0,
6.0,
8.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
9.0,
7.0
],
"name": "Upper Quartz Block",
"to": [
9.0,
11.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#quartz"
},
"east": {
"texture": "#quartz"
},
"north": {
"texture": "#quartz"
},
"south": {
"texture": "#quartz"
},
"up": {
"texture": "#quartz"
},
"west": {
"texture": "#quartz"
}
},
"from": [
7.0,
11.0,
8.0
],
"name": "Upper Quartz Tip",
"to": [
8.0,
12.0,
9.0
]
}
],
"parent": "block/block",
"textures": {
"metal": "appliedenergistics2:blocks/quartz_torch_metal",
"quartz": "appliedenergistics2:blocks/quartz_torch"
}
}
@@ -1,35 +1,107 @@
{
"parent": "builtin/entity",
"display": {
"gui": {
"rotation": [ 30, 45, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"scale":[ 0.25, 0.25, 0.25 ]
},
"head": {
"rotation": [ 0, 180, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 1, 1, 1]
"firstperson_righthand": {
"rotation": [
0,
315,
0
],
"scale": [
0.4,
0.4,
0.4
],
"translation": [
0,
0,
0
]
},
"fixed": {
"rotation": [ 0, 180, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.5, 0.5, 0.5 ]
"rotation": [
0,
180,
0
],
"scale": [
0.5,
0.5,
0.5
],
"translation": [
0,
0,
0
]
},
"ground": {
"rotation": [
0,
0,
0
],
"scale": [
0.25,
0.25,
0.25
],
"translation": [
0,
3,
0
]
},
"gui": {
"rotation": [
30,
45,
0
],
"scale": [
0.625,
0.625,
0.625
],
"translation": [
0,
0,
0
]
},
"head": {
"rotation": [
0,
180,
0
],
"scale": [
1,
1,
1
],
"translation": [
0,
0,
0
]
},
"thirdperson_righthand": {
"rotation": [ 75, 315, 0 ],
"translation": [ 0, 2.5, 0],
"scale": [ 0.375, 0.375, 0.375 ]
},
"firstperson_righthand": {
"rotation": [ 0, 315, 0 ],
"translation": [ 0, 0, 0],
"scale": [ 0.4, 0.4, 0.4 ]
"rotation": [
75,
315,
0
],
"scale": [
0.375,
0.375,
0.375
],
"translation": [
0,
2.5,
0
]
}
}
}
},
"parent": "builtin/entity"
}
@@ -1,35 +1,107 @@
{
"parent": "builtin/entity",
"display": {
"gui": {
"rotation": [ 30, 45, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"scale":[ 0.25, 0.25, 0.25 ]
},
"head": {
"rotation": [ 0, 180, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 1, 1, 1]
"firstperson_righthand": {
"rotation": [
0,
315,
0
],
"scale": [
0.4,
0.4,
0.4
],
"translation": [
0,
0,
0
]
},
"fixed": {
"rotation": [ 0, 180, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.5, 0.5, 0.5 ]
"rotation": [
0,
180,
0
],
"scale": [
0.5,
0.5,
0.5
],
"translation": [
0,
0,
0
]
},
"ground": {
"rotation": [
0,
0,
0
],
"scale": [
0.25,
0.25,
0.25
],
"translation": [
0,
3,
0
]
},
"gui": {
"rotation": [
30,
45,
0
],
"scale": [
0.625,
0.625,
0.625
],
"translation": [
0,
0,
0
]
},
"head": {
"rotation": [
0,
180,
0
],
"scale": [
1,
1,
1
],
"translation": [
0,
0,
0
]
},
"thirdperson_righthand": {
"rotation": [ 75, 315, 0 ],
"translation": [ 0, 2.5, 0],
"scale": [ 0.375, 0.375, 0.375 ]
},
"firstperson_righthand": {
"rotation": [ 0, 315, 0 ],
"translation": [ 0, 0, 0],
"scale": [ 0.4, 0.4, 0.4 ]
"rotation": [
75,
315,
0
],
"scale": [
0.375,
0.375,
0.375
],
"translation": [
0,
2.5,
0
]
}
}
}
},
"parent": "builtin/entity"
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 244 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 311 B