Skip to content

Commit 72396d1

Browse files
tereruntererun
authored
Merge pull request #109 from freeserverproject/develop
halloween update
2 parents 37fd93a + 6869f48 commit 72396d1

3 files changed

Lines changed: 137 additions & 2 deletions

File tree

‎pack/assets/minecraft/models/hats/witch_hat.json‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
{
2+
"credit": "Made with Blockbench",
3+
"textures": {
4+
"0": "block/black_wool",
5+
"1": "block/cyan_wool",
6+
"particle": "block/black_wool"
7+
},
8+
"elements": [
9+
{
10+
"from": [0, 0, 0],
11+
"to": [16, 2, 16],
12+
"faces": {
13+
"north": {"uv": [0, 0, 16, 2], "texture": "#0"},
14+
"east": {"uv": [0, 0, 16, 2], "texture": "#0"},
15+
"south": {"uv": [0, 0, 16, 2], "texture": "#0"},
16+
"west": {"uv": [0, 0, 16, 2], "texture": "#0"},
17+
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
18+
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
19+
}
20+
},
21+
{
22+
"from": [3, 1.5, 3],
23+
"to": [13, 2.5, 13],
24+
"faces": {
25+
"north": {"uv": [0, 0, 10, 1], "texture": "#1"},
26+
"east": {"uv": [0, 0, 10, 1], "texture": "#1"},
27+
"south": {"uv": [0, 0, 10, 1], "texture": "#1"},
28+
"west": {"uv": [0, 0, 10, 1], "texture": "#1"},
29+
"up": {"uv": [0, 0, 10, 10], "texture": "#1"},
30+
"down": {"uv": [0, 0, 10, 10], "texture": "#1"}
31+
}
32+
},
33+
{
34+
"from": [3, 2.5, 3],
35+
"to": [13, 6.75, 13],
36+
"faces": {
37+
"north": {"uv": [0, 0, 10, 4.25], "texture": "#0"},
38+
"east": {"uv": [0, 0, 10, 4.25], "texture": "#0"},
39+
"south": {"uv": [0, 0, 10, 4.25], "texture": "#0"},
40+
"west": {"uv": [0, 0, 10, 4.25], "texture": "#0"},
41+
"up": {"uv": [0, 0, 10, 10], "texture": "#0"},
42+
"down": {"uv": [0, 0, 10, 10], "texture": "#0"}
43+
}
44+
},
45+
{
46+
"from": [3.5, 3.75, 3.75],
47+
"to": [12.5, 9.25, 13.75],
48+
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 4.375, 8]},
49+
"faces": {
50+
"north": {"uv": [0, 0, 9, 5.5], "texture": "#0"},
51+
"east": {"uv": [0, 0, 10, 5.5], "texture": "#0"},
52+
"south": {"uv": [0, 0, 9, 5.5], "texture": "#0"},
53+
"west": {"uv": [0, 0, 10, 5.5], "texture": "#0"},
54+
"up": {"uv": [0, 0, 9, 10], "texture": "#0"},
55+
"down": {"uv": [0, 0, 9, 10], "texture": "#0"}
56+
}
57+
},
58+
{
59+
"from": [3.75, 4.02297, 8.83363],
60+
"to": [12, 10.02297, 16.58363],
61+
"rotation": {"angle": 45, "axis": "x", "origin": [8, 9.14797, 13.83363]},
62+
"faces": {
63+
"north": {"uv": [0, 0, 8.25, 6], "texture": "#0"},
64+
"east": {"uv": [0, 0, 7.75, 6], "texture": "#0"},
65+
"south": {"uv": [0, 0, 8.25, 6], "texture": "#0"},
66+
"west": {"uv": [0, 0, 7.75, 6], "texture": "#0"},
67+
"up": {"uv": [0, 0, 8.25, 7.75], "texture": "#0"},
68+
"down": {"uv": [0, 0, 8.25, 7.75], "texture": "#0"}
69+
}
70+
},
71+
{
72+
"from": [5.5, 5.52297, 9.83363],
73+
"to": [10.25, 11.52297, 14.58363],
74+
"rotation": {"angle": 45, "axis": "x", "origin": [8, 9.14797, 13.83363]},
75+
"faces": {
76+
"north": {"uv": [0, 0, 4.75, 6], "texture": "#0"},
77+
"east": {"uv": [0, 0, 4.75, 6], "texture": "#0"},
78+
"south": {"uv": [0, 0, 4.75, 6], "texture": "#0"},
79+
"west": {"uv": [0, 0, 4.75, 6], "texture": "#0"},
80+
"up": {"uv": [0, 0, 4.75, 4.75], "texture": "#0"},
81+
"down": {"uv": [0, 0, 4.75, 4.75], "texture": "#0"}
82+
}
83+
},
84+
{
85+
"from": [6.5, 10.77817, 10.87652],
86+
"to": [9.25, 13.52817, 16.87652],
87+
"rotation": {"angle": -22.5, "axis": "x", "origin": [7.875, 12.15317, 13.12652]},
88+
"faces": {
89+
"north": {"uv": [0, 0, 2.75, 2.75], "rotation": 180, "texture": "#0"},
90+
"east": {"uv": [0, 0, 2.75, 6], "rotation": 270, "texture": "#0"},
91+
"south": {"uv": [0, 0, 2.75, 2.75], "texture": "#0"},
92+
"west": {"uv": [0, 0, 2.75, 6], "rotation": 90, "texture": "#0"},
93+
"up": {"uv": [0, 0, 2.75, 6], "rotation": 180, "texture": "#0"},
94+
"down": {"uv": [0, 0, 2.75, 6], "texture": "#0"}
95+
}
96+
}
97+
],
98+
"display": {
99+
"thirdperson_righthand": {
100+
"translation": [0, 4, 1],
101+
"scale": [0.5, 0.5, 0.5]
102+
},
103+
"thirdperson_lefthand": {
104+
"translation": [0, 4, 1],
105+
"scale": [0.5, 0.5, 0.5]
106+
},
107+
"firstperson_righthand": {
108+
"rotation": [0, 13, 0],
109+
"translation": [0, 4, 1],
110+
"scale": [0.5, 0.5, 0.5]
111+
},
112+
"firstperson_lefthand": {
113+
"rotation": [0, 13, 0],
114+
"translation": [0, 4, 1],
115+
"scale": [0.5, 0.5, 0.5]
116+
},
117+
"ground": {
118+
"translation": [0, 1.75, 0],
119+
"scale": [0.75, 0.75, 0.75]
120+
},
121+
"gui": {
122+
"rotation": [-158.5, 34, -180],
123+
"translation": [0, 1, 0],
124+
"scale": [0.6, 0.6, 0.6]
125+
},
126+
"head": {
127+
"translation": [0, 14.5, 0]
128+
},
129+
"fixed": {
130+
"rotation": [-90, 0, 0],
131+
"translation": [0, 0, -8.75]
132+
}
133+
}
134+
}

‎pack/assets/minecraft/models/item/stick.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
{"predicate": {"custom_model_data":523}, "model":"item/otheritem/spinner"},
6969
{"predicate": {"custom_model_data":524}, "model":"placeable/kadomatu"},
7070
{"predicate": {"custom_model_data":525}, "model":"item/figure/others/komainu"},
71+
{"predicate": {"custom_model_data":526}, "model":"hats/witch_hat"},
7172
{"predicate": {"custom_model_data":1000}, "model":"item/otheritem/eva_meds/ifak"},
7273
{"predicate": {"custom_model_data":1100}, "model":"item/otheritem/eva_weapons/scar_l"},
7374
{"predicate": {"custom_model_data":5000}, "model":"item/figure/others/momizidani"},

‎pack/pack.mcmeta‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"pack":{
33
"pack_format": 6,
4-
"pack_version": "v1.17.6",
5-
"description": "F-Tex %pack_version% §c夏祭り§eアップデート"
4+
"pack_version": "v1.17.7",
5+
"description": "F-Tex %pack_version% §6ハロウィン§eアップデート"
66
}
77
}

0 commit comments

Comments
 (0)