Skip to content

Commit 4940868

Browse files
SamsTheNerdSamsTheNerd
authored
Merge branch 'main' into scroll-tweaks
2 parents c04d6d2 + 1d3a855 commit 4940868

File tree

79 files changed

+1115
-380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1115
-380
lines changed

‎.github/workflows/build_docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ permissions:
2424

2525
jobs:
2626
hexdoc:
27-
uses: hexdoc-dev/hexdoc/.github/workflows/hexdoc.yml@main
27+
uses: hexdoc-dev/actions/.github/workflows/hexdoc.yml@v1
2828
permissions:
2929
contents: write
3030
pages: read
@@ -51,7 +51,7 @@ jobs:
5151
id-token: write
5252
steps:
5353
- name: Download package artifact
54-
uses: actions/download-artifact@v3
54+
uses: actions/download-artifact@v4
5555
with:
5656
name: hexdoc-build
5757
path: dist

‎.github/workflows/pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
hexdoc:
7575
# don't bother running the docs build when pushing to main - nothing necessary to cache here
7676
if: github.event_name != 'push'
77-
uses: hexdoc-dev/hexdoc/.github/workflows/hexdoc.yml@main
77+
uses: hexdoc-dev/actions/.github/workflows/hexdoc.yml@v1
7878
permissions:
7979
contents: write
8080
pages: read

‎Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2023-12-24T17:59:13.7584156 Item Models: hexcasting
1+
// 1.20.1 2024-12-10T14:26:44.916295 Item Models: hexcasting
22
2fc68dcd6d73da3deaa6a33240dd9160a2b79592 assets/hexcasting/models/block/deco/quenched_allay_bricks_0.json
33
d59af7a48b20b210240b26115fb172d6202f9254 assets/hexcasting/models/block/deco/quenched_allay_bricks_1.json
44
a62eeebbca2d145c22f25725bd848ed4d673cefa assets/hexcasting/models/block/deco/quenched_allay_bricks_2.json
@@ -19,6 +19,22 @@ f2156b3a7041cf99891b528393db64c6b9ca1a4f assets/hexcasting/models/item/abacus.js
1919
19730853397b109cfedd0c3bbda83d5de6cd15b9 assets/hexcasting/models/item/akashic_record.json
2020
8c735feff09d46d00ed681311f46f61a50cfdc9b assets/hexcasting/models/item/amethyst_dust.json
2121
fbb8706993fbc3246c56b9f3eb274ff8968b70f8 assets/hexcasting/models/item/amethyst_pillar.json
22+
533a859174052a332de069b2ffeaf0106d132b9a assets/hexcasting/models/item/ancient_cypher.json
23+
71a7968e43fbb872ee52315a3ee738d0b3fd1a69 assets/hexcasting/models/item/ancient_cypher_0_filled.json
24+
0f0c627d7ed0e8a7e3666ca80ddc13b280d6ce9f assets/hexcasting/models/item/ancient_cypher_1.json
25+
097b8ecfb34df710ca4b396d3a5df7722ecc3596 assets/hexcasting/models/item/ancient_cypher_1_filled.json
26+
9fdde927e7e8b06221aef34a6a6b22d0b790f297 assets/hexcasting/models/item/ancient_cypher_2.json
27+
93257ad393b751931539a5641d4430a4631e95f9 assets/hexcasting/models/item/ancient_cypher_2_filled.json
28+
4af6234e24031ee0989282c8435fe07e85b02771 assets/hexcasting/models/item/ancient_cypher_3.json
29+
41760f3c89d8dc94c515b0ab8220ecf996710a3c assets/hexcasting/models/item/ancient_cypher_3_filled.json
30+
4df83ae775400ca2d480bfb3621abcf58d4d7352 assets/hexcasting/models/item/ancient_cypher_4.json
31+
d21eb7093c0231015808a8b51b27857da1748431 assets/hexcasting/models/item/ancient_cypher_4_filled.json
32+
e2b4e2ac4ad4fa4b490e1774a565a26fb840c474 assets/hexcasting/models/item/ancient_cypher_5.json
33+
4555e5de80047ffa4e72a4a98eb51437a95e7291 assets/hexcasting/models/item/ancient_cypher_5_filled.json
34+
420840b5761fcddbdd10186f3127bc7589badc46 assets/hexcasting/models/item/ancient_cypher_6.json
35+
55c08581a2e8c7134d63b38226bddafff0fba3ae assets/hexcasting/models/item/ancient_cypher_6_filled.json
36+
2731192f0c7a9a8d45ba4fcd8d1de60bade0b49e assets/hexcasting/models/item/ancient_cypher_7.json
37+
7ba3015d79601f1c8238dbac4a45e525e3589f16 assets/hexcasting/models/item/ancient_cypher_7_filled.json
2238
87e7ee44cdd0808a3dd72babfd1db716df2bcdfe assets/hexcasting/models/item/artifact.json
2339
1cd1b4d002d1a9a044ceab7cca842e4a2b7bd2f4 assets/hexcasting/models/item/artifact_0_filled.json
2440
4709e65d8e74cf45b3ba014bdf70373728cccc78 assets/hexcasting/models/item/artifact_1.json

‎Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher.json‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"overrides": [
4+
{
5+
"model": "hexcasting:item/ancient_cypher",
6+
"predicate": {
7+
"hexcasting:has_patterns": -0.01,
8+
"hexcasting:variant": 0.0
9+
}
10+
},
11+
{
12+
"model": "hexcasting:item/ancient_cypher_0_filled",
13+
"predicate": {
14+
"hexcasting:has_patterns": 0.99,
15+
"hexcasting:variant": 0.0
16+
}
17+
},
18+
{
19+
"model": "hexcasting:item/ancient_cypher_1",
20+
"predicate": {
21+
"hexcasting:has_patterns": -0.01,
22+
"hexcasting:variant": 1.0
23+
}
24+
},
25+
{
26+
"model": "hexcasting:item/ancient_cypher_1_filled",
27+
"predicate": {
28+
"hexcasting:has_patterns": 0.99,
29+
"hexcasting:variant": 1.0
30+
}
31+
},
32+
{
33+
"model": "hexcasting:item/ancient_cypher_2",
34+
"predicate": {
35+
"hexcasting:has_patterns": -0.01,
36+
"hexcasting:variant": 2.0
37+
}
38+
},
39+
{
40+
"model": "hexcasting:item/ancient_cypher_2_filled",
41+
"predicate": {
42+
"hexcasting:has_patterns": 0.99,
43+
"hexcasting:variant": 2.0
44+
}
45+
},
46+
{
47+
"model": "hexcasting:item/ancient_cypher_3",
48+
"predicate": {
49+
"hexcasting:has_patterns": -0.01,
50+
"hexcasting:variant": 3.0
51+
}
52+
},
53+
{
54+
"model": "hexcasting:item/ancient_cypher_3_filled",
55+
"predicate": {
56+
"hexcasting:has_patterns": 0.99,
57+
"hexcasting:variant": 3.0
58+
}
59+
},
60+
{
61+
"model": "hexcasting:item/ancient_cypher_4",
62+
"predicate": {
63+
"hexcasting:has_patterns": -0.01,
64+
"hexcasting:variant": 4.0
65+
}
66+
},
67+
{
68+
"model": "hexcasting:item/ancient_cypher_4_filled",
69+
"predicate": {
70+
"hexcasting:has_patterns": 0.99,
71+
"hexcasting:variant": 4.0
72+
}
73+
},
74+
{
75+
"model": "hexcasting:item/ancient_cypher_5",
76+
"predicate": {
77+
"hexcasting:has_patterns": -0.01,
78+
"hexcasting:variant": 5.0
79+
}
80+
},
81+
{
82+
"model": "hexcasting:item/ancient_cypher_5_filled",
83+
"predicate": {
84+
"hexcasting:has_patterns": 0.99,
85+
"hexcasting:variant": 5.0
86+
}
87+
},
88+
{
89+
"model": "hexcasting:item/ancient_cypher_6",
90+
"predicate": {
91+
"hexcasting:has_patterns": -0.01,
92+
"hexcasting:variant": 6.0
93+
}
94+
},
95+
{
96+
"model": "hexcasting:item/ancient_cypher_6_filled",
97+
"predicate": {
98+
"hexcasting:has_patterns": 0.99,
99+
"hexcasting:variant": 6.0
100+
}
101+
},
102+
{
103+
"model": "hexcasting:item/ancient_cypher_7",
104+
"predicate": {
105+
"hexcasting:has_patterns": -0.01,
106+
"hexcasting:variant": 7.0
107+
}
108+
},
109+
{
110+
"model": "hexcasting:item/ancient_cypher_7_filled",
111+
"predicate": {
112+
"hexcasting:has_patterns": 0.99,
113+
"hexcasting:variant": 7.0
114+
}
115+
}
116+
],
117+
"textures": {
118+
"layer0": "hexcasting:item/cad/0_ancient_cypher"
119+
}
120+
}

‎Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_0_filled.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "hexcasting:item/cad/0_ancient_cypher",
5+
"layer1": "hexcasting:item/cad/0_ancient_cypher_overlay"
6+
}
7+
}

‎Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_1.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "hexcasting:item/cad/1_ancient_cypher"
5+
}
6+
}

‎Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_1_filled.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "hexcasting:item/cad/1_ancient_cypher",
5+
"layer1": "hexcasting:item/cad/1_ancient_cypher_overlay"
6+
}
7+
}

‎Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_2.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "hexcasting:item/cad/2_ancient_cypher"
5+
}
6+
}

‎Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_2_filled.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "hexcasting:item/cad/2_ancient_cypher",
5+
"layer1": "hexcasting:item/cad/2_ancient_cypher_overlay"
6+
}
7+
}

‎Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_3.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "hexcasting:item/cad/3_ancient_cypher"
5+
}
6+
}

0 commit comments

Comments
 (0)