Merge remote-tracking branch 'origin/1.9.4' into 1.9.4
# Conflicts: # run/resourcepacks/unity/assets/techreborn/blockstates/machines/centrifuge.json
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 781 B |
After Width: | Height: | Size: 1.4 KiB |
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"animation": {
|
||||
"frametime": 10,
|
||||
"interpolate": true
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 625 B |
After Width: | Height: | Size: 1.2 KiB |
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"animation": {
|
||||
"frametime": 10,
|
||||
"interpolate": true
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 914 B |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 912 B |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 913 B |