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:
commit
f174749f26
25 changed files with 265 additions and 102 deletions
Binary file not shown.
After Width: | Height: | Size: 781 B |
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
|
@ -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 |
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"animation": {
|
||||
"frametime": 10,
|
||||
"interpolate": true
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue