mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-02-10 12:25:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev

Browse source
This commit is contained in:
Jozufozu 2021-07-10 13:14:05 -07:00
commit b071229731
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/resources/assets/create/models/block/fluid_pipe/item.json
View file

@ -66,5 +66,11 @@
"down": {"uv": [6, 5, 11, 6], "texture": "#1"} "down": {"uv": [6, 5, 11, 6], "texture": "#1"}
} }
} }
] ],
"display": {
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
}
} }

3
src/main/resources/assets/create/models/block/mechanical_mixer/item.json
View file

@ -9,7 +9,8 @@
"6": "create:block/mixer_head", "6": "create:block/mixer_head",
"11": "create:block/mechanical_press_top", "11": "create:block/mechanical_press_top",
"1_2": "create:block/cogwheel", "1_2": "create:block/cogwheel",
"mechanical_press_pole": "create:block/mechanical_press_pole" "mechanical_press_pole": "create:block/mechanical_press_pole",
"particle": "create:block/andesite_casing"
}, },
"elements": [ "elements": [
{ {

3
src/main/resources/assets/create/models/item/potato_cannon/item.json
View file

@ -3,7 +3,8 @@
"parent": "create:item/potato_cannon/item", "parent": "create:item/potato_cannon/item",
"texture_size": [32, 32], "texture_size": [32, 32],
"textures": { "textures": {
"1": "create:item/potato_cannon" "1": "create:item/potato_cannon",
"particle": "create:block/copper_casing"
}, },
"elements": [ "elements": [
{ {