Skip to content

Commit 50abb38

Browse files
committed
Merge remote-tracking branch 'origin/main-1.20.1-forge' into main-1.20.1-forge
2 parents b64ec0f + 30c2e73 commit 50abb38

17 files changed

Lines changed: 35 additions & 35 deletions
50 Bytes
Loading
11 Bytes
Loading
138 Bytes
Loading
174 Bytes
Loading
2 Bytes
Loading
11 Bytes
Loading
394 Bytes
Loading
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{
2-
"animation": {
3-
"interpolate": true,
4-
"frametime": 6
5-
}
1+
{
2+
"animation": {
3+
"interpolate": true,
4+
"frametime": 6
5+
}
66
}
191 Bytes
Loading
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{
2-
"animation": {
3-
"interpolate": true,
4-
"frametime": 2
5-
}
6-
}
1+
{
2+
"animation": {
3+
"interpolate": true,
4+
"frametime": 3
5+
}
6+
}

0 commit comments

Comments
 (0)