Skip to content

Commit

Permalink
杂七杂八
Browse files Browse the repository at this point in the history
  • Loading branch information
Lazy-Pillow-Minecraft committed Oct 3, 2024
1 parent 65c7331 commit 596f1bf
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ protected void addTranslations() {
add("painting.confluence.khaki_coffee_beans.title", "KHAKI_COFFEE_BEANS");
add("painting.confluence.khaki_coffee_beans.author", "BiliBili_卡其色咖啡豆");
add("painting.confluence.uqtqu_day.title", "UQTQU_DAY");
add("painting.confluence.uqtqu_day.author", "BiliBili__昼泽_");
add("painting.confluence.uqtqu_day.author", "BiliBili__昼泽_,✞ʚ散兵重度依赖ɞ✟⁺");
add("painting.confluence.emerald_shenyi.title", "EMERALD_SHENYI");
add("painting.confluence.emerald_shenyi.author", "BiliBili_Emerald_审翼");
add("painting.confluence.chromatic.title", "CHROMATIC");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,28 @@
}
}
}
},
"animation.sky_mill.none": {
"loop": true,
"animation_length": 4,
"bones": {
"bone": {
"relative_to": {
"rotation": "entity"
},
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"2.0": {
"vector": [0, 0, 180]
},
"4.0": {
"vector": [0, 0, 360]
}
}
}
}
}
},
"geckolib_format_version": 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"cubes": [
{"origin": [-2, 13, 4], "size": [4, 4, 2], "uv": [28, 0]},
{"origin": [-5.5, 15.5, 3.5], "size": [5, 5, 2], "uv": [24, 22]},
{"origin": [-3.5, 16.5, 3.5], "size": [5, 5, 2], "pivot": [0.5, 16.5, 4.5], "rotation": [0, 0, 90], "uv": [24, 22]},
{"origin": [-2.5, 14.5, 3.5], "size": [5, 5, 2], "pivot": [1.5, 14.5, 4.5], "rotation": [0, 0, -180], "uv": [24, 22]},
{"origin": [-4.5, 13.5, 3.5], "size": [5, 5, 2], "pivot": [-0.5, 13.5, 4.5], "rotation": [0, 0, -90], "uv": [24, 22]}
{"origin": [0.5, 15.5, 3.5], "size": [5, 5, 2], "uv": [24, 22], "mirror": true},
{"origin": [0.5, 9.5, 3.5], "size": [5, 5, 2], "uv": [24, 22], "mirror": true},
{"origin": [-5.5, 9.5, 3.5], "size": [5, 5, 2], "uv": [24, 22]}
]
}
]
Expand Down
Binary file modified src/main/resources/assets/confluence/textures/block/sky_mill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,15 @@
},
"weight": 2
},
{
"element": {
"element_type": "minecraft:legacy_single_pool_element",
"location": "confluence:common_village/taiga_bank_0",
"processors": "minecraft:mossify_10_percent",
"projection": "rigid"
},
"weight": 50
},
{
"element": {
"element_type": "minecraft:legacy_single_pool_element",
Expand Down

0 comments on commit 596f1bf

Please sign in to comment.