fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent 3d2ba425ec 153b38b74c
commit b31e5f5356
57 changed files with 2566 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json
+305
View File
@@ -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"
}
}
src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json
+305
View File
@@ -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"
}
}
src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json
+207
View File
@@ -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"
}
}
src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json
+207
View File
@@ -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"
}
}