Skip to content

Commit

Permalink
v1.6.2 (#57)
Browse files Browse the repository at this point in the history 
Signed-off-by: Illyrius <28700752+illyrius666@users.noreply.github.com>
  • Loading branch information
@illyrius666
illyrius666 authored Sep 20, 2024
1 parent 1c365de commit a969a56
Show file tree
Hide file tree
Showing 9 changed files with 1,095 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:
jobs:
release:
name: Release
if: github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.message, '.deploy')
if: github.event_name == 'workflow_dispatch'
runs-on: [ubuntu-latest]
environment:
name: ${{ github.ref_name }}
Expand Down
284 changes: 284 additions & 0 deletions illyriarp/assets/custom/models/item/weapons/illithid_sword.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
{
"credit": "Made by Elo106",
"texture_size": [32, 32],
"textures": {
"0": "custom:item/weapons/illithid_sword",
"particle": "custom:item/weapons/illithid_sword"
},
"elements": [
{
"from": [7.48, 7.98, 5.98],
"to": [8.52, 19.02, 10.02],
"rotation": { "angle": 0, "axis": "y", "origin": [8, 2.5, 8] },
"faces": {
"north": { "uv": [6, 7.5, 6.5, 13], "texture": "#0" },
"east": { "uv": [3, 0, 5, 5.5], "texture": "#0" },
"south": { "uv": [6.5, 7.5, 7, 13], "texture": "#0" },
"west": { "uv": [5, 0, 7, 5.5], "texture": "#0" },
"up": { "uv": [7.5, 12, 7, 10], "texture": "#0" },
"down": { "uv": [8, 10, 7.5, 12], "texture": "#0" }
}
},
{
"from": [7, -2.5, 7],
"to": [9, -0.5, 9],
"rotation": { "angle": -45, "axis": "x", "origin": [8, -1.5, 8] },
"faces": {
"north": { "uv": [10.5, 4.5, 11.5, 5.5], "texture": "#0" },
"east": { "uv": [10.5, 5.5, 11.5, 6.5], "texture": "#0" },
"south": { "uv": [10.5, 6.5, 11.5, 7.5], "texture": "#0" },
"west": { "uv": [10.5, 7.5, 11.5, 8.5], "texture": "#0" },
"up": { "uv": [9, 11.5, 8, 10.5], "texture": "#0" },
"down": { "uv": [11.5, 8.5, 10.5, 9.5], "texture": "#0" }
}
},
{
"from": [7.5, 0, 7],
"to": [8.5, 7, 9],
"rotation": { "angle": 0, "axis": "y", "origin": [8, 3.5, 8] },
"faces": {
"north": { "uv": [9, 4, 9.5, 7.5], "texture": "#0" },
"east": { "uv": [4, 7.5, 5, 11], "texture": "#0" },
"south": { "uv": [9, 7.5, 9.5, 11], "texture": "#0" },
"west": { "uv": [5, 7.5, 6, 11], "texture": "#0" },
"up": { "uv": [12.5, 3, 12, 2], "texture": "#0" },
"down": { "uv": [8, 12, 7.5, 13], "texture": "#0" }
}
},
{
"from": [7, -1, 7],
"to": [9, 0, 9],
"rotation": { "angle": 45, "axis": "y", "origin": [8, -0.5, 8] },
"faces": {
"north": { "uv": [11.5, 9, 12.5, 9.5], "texture": "#0" },
"east": { "uv": [12, 10, 13, 10.5], "texture": "#0" },
"south": { "uv": [12, 10.5, 13, 11], "texture": "#0" },
"west": { "uv": [12, 11, 13, 11.5], "texture": "#0" },
"up": { "uv": [10.5, 11.5, 9.5, 10.5], "texture": "#0" },
"down": { "uv": [11.5, 10.5, 10.5, 11.5], "texture": "#0" }
}
},
{
"from": [7, 6, 7],
"to": [9, 8, 9],
"rotation": { "angle": -45, "axis": "x", "origin": [8, 7, 8] },
"faces": {
"north": { "uv": [11, 0, 12, 1], "texture": "#0" },
"east": { "uv": [3, 11, 2, 12], "texture": "#0" },
"south": { "uv": [11, 1, 12, 2], "texture": "#0" },
"west": { "uv": [2, 11, 3, 12], "texture": "#0" },
"up": { "uv": [12, 3, 11, 2], "texture": "#0" },
"down": { "uv": [5, 11, 4, 12], "texture": "#0" }
}
},
{
"from": [7.5, 8, 6.5],
"to": [8.5, 26, 9.5],
"rotation": { "angle": 0, "axis": "y", "origin": [8, 2.5, 8] },
"faces": {
"north": { "uv": [3, 5.5, 3.5, 14.5], "texture": "#0" },
"east": { "uv": [3, 0, 1.5, 9], "texture": "#0" },
"south": { "uv": [3.5, 5.5, 4, 14.5], "texture": "#0" },
"west": { "uv": [1.5, 0, 3, 9], "texture": "#0" },
"up": { "uv": [6, 13.5, 5.5, 12], "texture": "#0" },
"down": { "uv": [7.5, 12, 7, 13.5], "texture": "#0" }
}
},
{
"from": [7.002, 7.4608, 6.89435],
"to": [8.998, 10.4568, 8.89035],
"rotation": {
"angle": -22.5,
"axis": "x",
"origin": [8, 6.4588, 7.89235]
},
"faces": {
"north": { "uv": [9.5, 7, 10.5, 8.5], "texture": "#0" },
"east": { "uv": [11, 1.5, 10, 3], "texture": "#0" },
"south": { "uv": [10, 0, 11, 1.5], "texture": "#0" },
"west": { "uv": [10, 1.5, 11, 3], "texture": "#0" },
"up": { "uv": [12.5, 8, 11.5, 7], "texture": "#0" },
"down": { "uv": [9, 11.5, 8, 12.5], "texture": "#0" }
}
},
{
"from": [7.003, 7.94621, 8.15105],
"to": [8.997, 8.94021, 13.14505],
"rotation": { "angle": 45, "axis": "x", "origin": [8, 6.94321, 9.14805] },
"faces": {
"north": { "uv": [13.5, 1.5, 12.5, 2], "texture": "#0" },
"east": { "uv": [12.5, 3, 10, 3.5], "texture": "#0" },
"south": { "uv": [13.5, 1, 12.5, 1.5], "texture": "#0" },
"west": { "uv": [12.5, 3.5, 10, 4], "texture": "#0" },
"up": { "uv": [8, 7.5, 7, 10], "texture": "#0" },
"down": { "uv": [9, 6.5, 8, 4], "texture": "#0" }
}
},
{
"from": [7.5, 8.94321, 8.14805],
"to": [8.5, 9.94321, 12.14805],
"rotation": { "angle": 45, "axis": "x", "origin": [8, 6.94321, 9.14805] },
"faces": {
"north": { "uv": [13, 5.5, 12.5, 6], "texture": "#0" },
"east": { "uv": [13.5, 8, 11.5, 8.5], "texture": "#0" },
"south": { "uv": [13, 5, 12.5, 5.5], "texture": "#0" },
"west": { "uv": [13.5, 8.5, 11.5, 9], "texture": "#0" },
"up": { "uv": [10, 11.5, 9.5, 13.5], "texture": "#0" },
"down": { "uv": [10.5, 13.5, 10, 11.5], "texture": "#0" }
}
},
{
"from": [7.002, 7.4608, 7.10965],
"to": [8.998, 10.4568, 9.10565],
"rotation": {
"angle": 22.5,
"axis": "x",
"origin": [8, 6.4588, 8.10765]
},
"faces": {
"north": { "uv": [11, 0, 10, 1.5], "texture": "#0" },
"east": { "uv": [10, 1.5, 11, 3], "texture": "#0" },
"south": { "uv": [10.5, 7, 9.5, 8.5], "texture": "#0" },
"west": { "uv": [11, 1.5, 10, 3], "texture": "#0" },
"up": { "uv": [12.5, 7, 11.5, 8], "texture": "#0" },
"down": { "uv": [9, 12.5, 8, 11.5], "texture": "#0" }
}
},
{
"from": [7.5, 8.94321, 3.85195],
"to": [8.5, 9.94321, 7.85195],
"rotation": {
"angle": -45,
"axis": "x",
"origin": [8, 6.94321, 6.85195]
},
"faces": {
"north": { "uv": [12.5, 5, 13, 5.5], "texture": "#0" },
"east": { "uv": [11.5, 8, 13.5, 8.5], "texture": "#0" },
"south": { "uv": [12.5, 5.5, 13, 6], "texture": "#0" },
"west": { "uv": [11.5, 8.5, 13.5, 9], "texture": "#0" },
"up": { "uv": [10, 13.5, 9.5, 11.5], "texture": "#0" },
"down": { "uv": [10.5, 11.5, 10, 13.5], "texture": "#0" }
}
},
{
"from": [7.499, 23.999, 6.499],
"to": [8.501, 28.001, 10.501],
"rotation": { "angle": 45, "axis": "x", "origin": [8, 26.5, 8] },
"faces": {
"north": { "uv": [10.5, 11.5, 11, 13.5], "texture": "#0" },
"east": { "uv": [8, 5.5, 6, 7.5], "texture": "#0" },
"south": { "uv": [11.5, 10.5, 12, 12.5], "texture": "#0" },
"west": { "uv": [6, 5.5, 8, 7.5], "texture": "#0" },
"up": { "uv": [11.5, 13.5, 11, 11.5], "texture": "#0" },
"down": { "uv": [12.5, 0, 12, 2], "texture": "#0" }
}
},
{
"from": [7.501, 23.63015, 5.40406],
"to": [8.499, 27.62815, 7.40206],
"rotation": {
"angle": -22.5,
"axis": "x",
"origin": [8, 26.12915, 9.90306]
},
"faces": {
"north": { "uv": [1, 12, 1.5, 14], "texture": "#0" },
"east": { "uv": [9, 0, 10, 2], "texture": "#0" },
"south": { "uv": [1.5, 12, 2, 14], "texture": "#0" },
"west": { "uv": [1, 9, 2, 11], "texture": "#0" },
"up": { "uv": [12.5, 12.5, 12, 11.5], "texture": "#0" },
"down": { "uv": [0.5, 12.5, 0, 13.5], "texture": "#0" }
}
},
{
"from": [7.502, 23.63115, 8.59894],
"to": [8.498, 27.62715, 10.59494],
"rotation": {
"angle": 22.5,
"axis": "x",
"origin": [8, 26.12915, 6.09694]
},
"faces": {
"north": { "uv": [2, 12, 2.5, 14], "texture": "#0" },
"east": { "uv": [2, 9, 3, 11], "texture": "#0" },
"south": { "uv": [2.5, 12, 3, 14], "texture": "#0" },
"west": { "uv": [9, 2, 10, 4], "texture": "#0" },
"up": { "uv": [13, 1, 12.5, 0], "texture": "#0" },
"down": { "uv": [1, 12.5, 0.5, 13.5], "texture": "#0" }
}
},
{
"from": [7.501, 14.001, 6.501],
"to": [8.499, 17.999, 10.499],
"rotation": { "angle": 45, "axis": "x", "origin": [8, 16.5, 8] },
"faces": {
"north": { "uv": [4, 12, 4.5, 14], "texture": "#0" },
"east": { "uv": [9, 2, 7, 4], "texture": "#0" },
"south": { "uv": [4.5, 12, 5, 14], "texture": "#0" },
"west": { "uv": [7, 2, 9, 4], "texture": "#0" },
"up": { "uv": [5.5, 14, 5, 12], "texture": "#0" },
"down": { "uv": [12.5, 5, 12, 7], "texture": "#0" }
}
},
{
"from": [7.003, 7.94621, 2.85495],
"to": [8.997, 8.94021, 7.84895],
"rotation": {
"angle": -45,
"axis": "x",
"origin": [8, 6.94321, 6.85195]
},
"faces": {
"north": { "uv": [12.5, 1, 13.5, 1.5], "texture": "#0" },
"east": { "uv": [10, 3, 12.5, 3.5], "texture": "#0" },
"south": { "uv": [12.5, 1.5, 13.5, 2], "texture": "#0" },
"west": { "uv": [10, 3.5, 12.5, 4], "texture": "#0" },
"up": { "uv": [8, 10, 7, 7.5], "texture": "#0" },
"down": { "uv": [9, 4, 8, 6.5], "texture": "#0" }
}
}
],
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"translation": [0, 3.5, 0]
},
"thirdperson_lefthand": {
"translation": [0, 3.5, 0]
},
"firstperson_righthand": {
"rotation": [20, -10, -13],
"translation": [-0.25, 0.25, -0.5],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [20, -10, -13],
"translation": [-0.25, 0.25, -0.5],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"rotation": [-180, 0, -32],
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [90, 45, -90],
"translation": [-2.5, -2.5, 0],
"scale": [0.69, 0.69, 0.69]
},
"fixed": {
"rotation": [90, -45, 90],
"translation": [2.75, -2.75, -0.5],
"scale": [0.85, 0.85, 0.85]
}
},
"groups": [
{
"name": "group",
"origin": [8, 6.94321, 9.14805],
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
}
]
}
Loading

0 comments on commit a969a56

Please sign in to comment.