Merge remote-tracking branch 'origin/1.9.4' into 1.9.4

# Conflicts:

#	run/resourcepacks/unity/assets/techreborn/blockstates/machines/centrifuge.json
This commit is contained in:
Yulife 2016-06-04 12:30:23 +02:00
commit f174749f26
25 changed files with 265 additions and 102 deletions

View file

@ -0,0 +1,63 @@
{
"forge_marker":1,
"defaults":{
"transform":"forge:default-block",
"model":"orientable",
"textures":{
"particle":"techreborn:blocks/machine/advanced_machines/advanced_machine_west",
"down":"techreborn:blocks/machine/advanced_machines/advanced_machine_bottom",
"west":"techreborn:blocks/machine/advanced_machines/advanced_machine_west",
"east":"techreborn:blocks/machine/advanced_machines/advanced_machine_east",
"south":"techreborn:blocks/machine/advanced_machines/advanced_machine_back"
}
},
"variants":{
"inventory":{
"transform":"forge:default-block",
"textures":{
"top":"techreborn:blocks/machine/advanced_machines/industrial_centrifuge_top_off",
"front":"techreborn:blocks/machine/advanced_machines/industrial_centrifuge_front_off"
}
},
"facing":{
"north":{
},
"east":{
"y":90
},
"south":{
"y":180
},
"west":{
"y":270
}
},
"active":{
"true":{
"textures":{
"top":"techreborn:blocks/machine/advanced_machines/industrial_centrifuge_top_on",
"front":"techreborn:blocks/machine/advanced_machines/industrial_centrifuge_front_on"
}
},
"false":{
"textures":{
"top":"techreborn:blocks/machine/advanced_machines/industrial_centrifuge_top_off",
"front":"techreborn:blocks/machine/advanced_machines/industrial_centrifuge_front_off"
}
}
},
"inventory": {
"model": "orientable",
"textures": {
"particle":"techreborn:blocks/machine/advanced_machines/advanced_machine_west",
"top":"techreborn:blocks/machine/advanced_machines/industrial_centrifuge_top_off",
"down":"techreborn:blocks/machine/advanced_machines/advanced_machine_bottom",
"west":"techreborn:blocks/machine/advanced_machines/advanced_machine_west",
"east":"techreborn:blocks/machine/advanced_machines/advanced_machine_east",
"south":"techreborn:blocks/machine/advanced_machines/advanced_machine_back",
"front": "techreborn:blocks/machine/advanced_machines/industrial_centrifuge_front_off"
}
}
}
}

View file

@ -0,0 +1,59 @@
{
"forge_marker":1,
"defaults":{
"transform":"forge:default-block",
"model":"orientable",
"textures":{
"particle":"techreborn:blocks/machine/tier1_machines/machine_side",
"down":"techreborn:blocks/machine/tier1_machines/machine_bottom",
"side":"techreborn:blocks/machine/tier1_machines/machine_side"
}
},
"variants":{
"inventory":{
"transform":"forge:default-block",
"textures":{
"top":"techreborn:blocks/machine/tier1_machines/vacuum_freezer_top_off",
"front":"techreborn:blocks/machine/tier1_machines/vacuum_freezer_front_off"
}
},
"facing":{
"north":{
},
"east":{
"y":90
},
"south":{
"y":180
},
"west":{
"y":270
}
},
"active":{
"true":{
"textures":{
"top":"techreborn:blocks/machine/tier1_machines/vacuum_freezer_top_on",
"front":"techreborn:blocks/machine/tier1_machines/vacuum_freezer_front_on"
}
},
"false":{
"textures":{
"top":"techreborn:blocks/machine/tier1_machines/vacuum_freezer_top_off",
"front":"techreborn:blocks/machine/tier1_machines/vacuum_freezer_front_off"
}
}
},
"inventory": {
"model": "orientable",
"textures": {
"particle": "techreborn:blocks/machine/tier1_machines/machine_side",
"down":"techreborn:blocks/machine/tier1_machines/machine_bottom",
"side": "techreborn:blocks/machine/tier1_machines/machine_side",
"top":"techreborn:blocks/machine/tier1_machines/vacuum_freezer_top_off",
"front":"techreborn:blocks/machine/tier1_machines/vacuum_freezer_front_off"
}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 781 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

@ -0,0 +1,6 @@
{
"animation": {
"frametime": 10,
"interpolate": true
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

@ -0,0 +1,6 @@
{
"animation": {
"frametime": 10,
"interpolate": true
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 912 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B