Skip to content

Commit b828979

Browse files
committed
Merge remote-tracking branch 'origin/main-1.20.1-forge' into main-1.20.1-forge
2 parents 741f2ce + 1477316 commit b828979

27 files changed

Lines changed: 109 additions & 31 deletions

src/main/java/com/ghostipedia/cosmiccore/common/data/recipe/CosmicMaterialRecipeHandlers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private static void processModularShelling(@NotNull Consumer<FinishedRecipe> pro
5353
HEAVY_ASSEMBLER.recipeBuilder("heavy_assemble_" + material.getName() + "_modular_shelling")
5454

5555
.inputItems(frameGt, material, 4)
56-
.outputItems(heavyBeam, 4)
56+
.inputItems(heavyBeam, material, 4)
5757
.inputItems(plate, material, 16)
5858
.inputItems(bolt, material, 32)
5959
.outputItems(modularShelling, material, 1)
89 Bytes
Loading
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
{
22
"animation": {
3-
"interpolate": false,
4-
"frametime": 30
3+
"interpolate": true,
4+
"frametime": 1,
5+
"frames": [
6+
0,
7+
1,
8+
2,
9+
{ "index": 3, "time": 2 },
10+
{ "index": 4, "time": 2 },
11+
{ "index": 5, "time": 3 },
12+
{ "index": 6, "time": 7 },
13+
6
14+
]
515
}
6-
}
16+
}
11 Bytes
Loading
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"animation": {
3-
"interpolate": false,
4-
"frametime": 30
3+
"interpolate": true,
4+
"frametime": 8
55
}
6-
}
6+
}
32 Bytes
Loading
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"animation": {
33
"interpolate": false,
4-
"frametime": 30
4+
"frametime": 2,
5+
"frames": [
6+
0, 1, 2, 3, 4, 3, 2, 1
7+
]
58
}
69
}
18 Bytes
Loading
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
{
22
"animation": {
3-
"interpolate": false,
4-
"frametime": 30
3+
"interpolate": true,
4+
"frametime": 2,
5+
"frames": [
6+
{ "index": 0, "time": 9 },
7+
0,
8+
1,
9+
2,
10+
3,
11+
4
12+
]
513
}
614
}
7 Bytes
Loading

0 commit comments

Comments
 (0)