Skip to content

Commit

Permalink
Merge pull request #84 from HerobrineFR/dev
Browse files Browse the repository at this point in the history 
Merge dev into master
  • Loading branch information
@Inposa
Inposa authored Oct 17, 2024
2 parents 86a0ba9 + bacab4d commit 90ff58e
Show file tree
Hide file tree
Showing 29 changed files with 631 additions and 17 deletions.
32 changes: 32 additions & 0 deletions assets/minecraft/font/eyliaren.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"providers": [
{
"type": "ttf",
"file": "minecraft:eyliaren.ttf",
"size": 12.0,
"oversample": 20.0,
"skip": [
" ",
",",
".",
":",
"(",
")",
"?",
"!",
"é",
"è",
"à",
"'",
"\""
]
},
{
"type": "ttf",
"file": "minecraft:alkhemikal.ttf",
"shift": [0, 0.5],
"size": 11.0,
"oversample": 6.0
}
]
}
Binary file added assets/minecraft/font/eyliaren.ttf
View file
Binary file not shown.
0 ...ral/vetements/cornes/classique/corne.json → ...ements/cornes/belier/classique/corne.json
View file
File renamed without changes.
0 ...eral/vetements/cornes/classique/corne.png → ...tements/cornes/belier/classique/corne.png
View file
File renamed without changes
0 ...tements/cornes/classique/corne.properties → .../cornes/belier/classique/corne.properties
View file
File renamed without changes.
0 ...tements/cornes/obsidienne/corne_obsi.json → .../cornes/belier/obsidienne/corne_obsi.json
View file
File renamed without changes.
0 ...etements/cornes/obsidienne/corne_obsi.png → ...s/cornes/belier/obsidienne/corne_obsi.png
View file
File renamed without changes
0 ...s/cornes/obsidienne/corne_obsi.properties → ...s/belier/obsidienne/corne_obsi.properties
View file
File renamed without changes.
192 changes: 192 additions & 0 deletions ...tifine/cit/general/vetements/cornes/small_cornes/small_cornes_bois/small_cornes_bois.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "small_cornes_bois",
"particle": "small_cornes_bois"
},
"elements": [
{
"from": [13, -0.5, 10],
"to": [16, 2.5, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [13, -0.5, 10]},
"faces": {
"north": {"uv": [0, 0, 1.5, 1.5], "texture": "#0"},
"east": {"uv": [0, 1.5, 1.5, 3], "texture": "#0"},
"south": {"uv": [1.5, 0, 3, 1.5], "texture": "#0"},
"west": {"uv": [1.5, 1.5, 3, 3], "texture": "#0"},
"up": {"uv": [1.5, 4.5, 0, 3], "texture": "#0"},
"down": {"uv": [4.5, 0, 3, 1.5], "texture": "#0"}
}
},
{
"from": [14.8, 0.65, 7],
"to": [16.8, 2.65, 11.5],
"rotation": {"angle": 0, "axis": "y", "origin": [14.3, 0.4, 9.25]},
"faces": {
"north": {"uv": [4.5, 6, 5.5, 7], "texture": "#0"},
"east": {"uv": [1.5, 3, 3.75, 4], "texture": "#0"},
"south": {"uv": [5.5, 6, 6.5, 7], "texture": "#0"},
"west": {"uv": [3, 1.5, 5.25, 2.5], "texture": "#0"},
"up": {"uv": [2.5, 6.25, 1.5, 4], "texture": "#0"},
"down": {"uv": [3.5, 4, 2.5, 6.25], "texture": "#0"}
}
},
{
"from": [14.1, 1.05, 4],
"to": [16.1, 3.05, 8.35],
"rotation": {"angle": 22.5, "axis": "y", "origin": [13.6, 0.8, 5.1]},
"faces": {
"north": {"uv": [1, 6.5, 2, 7.5], "texture": "#0"},
"east": {"uv": [4, 2.5, 6.25, 3.5], "texture": "#0"},
"south": {"uv": [2, 6.5, 3, 7.5], "texture": "#0"},
"west": {"uv": [3.5, 4, 5.75, 5], "texture": "#0"},
"up": {"uv": [1, 6.75, 0, 4.5], "texture": "#0"},
"down": {"uv": [4.5, 5, 3.5, 7.25], "texture": "#0"}
}
},
{
"from": [10.81066, 1.45, 1.88934],
"to": [15.31066, 3.45, 3.88934],
"rotation": {"angle": -22.5, "axis": "y", "origin": [13.06066, 2.45, 2.88934]},
"faces": {
"north": {"uv": [4.5, 0, 6.75, 1], "texture": "#0"},
"east": {"uv": [6.5, 2, 7.5, 3], "texture": "#0"},
"south": {"uv": [4.5, 5, 6.75, 6], "texture": "#0"},
"west": {"uv": [6.5, 6, 7.5, 7], "texture": "#0"},
"up": {"uv": [7.75, 2, 5.5, 1], "texture": "#0"},
"down": {"uv": [8.25, 3.5, 6, 4.5], "texture": "#0"}
}
},
{
"from": [9.40223, 2.92217, 0.9],
"to": [11.90223, 4.42217, 2.4],
"rotation": {"angle": -45, "axis": "z", "origin": [10.65223, 3.67217, 1.65]},
"faces": {
"north": {"uv": [7, 0, 8.25, 0.75], "texture": "#0"},
"east": {"uv": [1, 7.5, 1.75, 8.25], "texture": "#0"},
"south": {"uv": [4.5, 7, 5.75, 7.75], "texture": "#0"},
"west": {"uv": [2, 7.5, 2.75, 8.25], "texture": "#0"},
"up": {"uv": [8.25, 5.25, 7, 4.5], "texture": "#0"},
"down": {"uv": [7.25, 7, 6, 7.75], "texture": "#0"}
}
},
{
"from": [8.95223, 4.12217, 0.7],
"to": [10.05223, 6.62217, 1.8],
"rotation": {"angle": 22.5, "axis": "z", "origin": [9.50223, 5.37217, 1.25]},
"faces": {
"north": {"uv": [1, 4.5, 1.5, 5.75], "texture": "#0"},
"east": {"uv": [3, 6.5, 3.5, 7.75], "texture": "#0"},
"south": {"uv": [0, 7, 0.5, 8.25], "texture": "#0"},
"west": {"uv": [0.5, 7, 1, 8.25], "texture": "#0"},
"up": {"uv": [3.5, 3, 3, 2.5], "texture": "#0"},
"down": {"uv": [4, 2.5, 3.5, 3], "texture": "#0"}
}
},
{
"from": [0, -0.5, 10],
"to": [3, 2.5, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [3, -0.5, 10]},
"faces": {
"north": {"uv": [1.5, 0, 0, 1.5], "texture": "#0"},
"east": {"uv": [3, 1.5, 1.5, 3], "texture": "#0"},
"south": {"uv": [3, 0, 1.5, 1.5], "texture": "#0"},
"west": {"uv": [1.5, 1.5, 0, 3], "texture": "#0"},
"up": {"uv": [0, 4.5, 1.5, 3], "texture": "#0"},
"down": {"uv": [3, 0, 4.5, 1.5], "texture": "#0"}
}
},
{
"from": [-0.8, 0.65, 7],
"to": [1.2, 2.65, 11.5],
"rotation": {"angle": 0, "axis": "y", "origin": [1.7, 0.4, 9.25]},
"faces": {
"north": {"uv": [5.5, 6, 4.5, 7], "texture": "#0"},
"east": {"uv": [5.25, 1.5, 3, 2.5], "texture": "#0"},
"south": {"uv": [6.5, 6, 5.5, 7], "texture": "#0"},
"west": {"uv": [3.75, 3, 1.5, 4], "texture": "#0"},
"up": {"uv": [1.5, 6.25, 2.5, 4], "texture": "#0"},
"down": {"uv": [2.5, 4, 3.5, 6.25], "texture": "#0"}
}
},
{
"from": [-0.1, 1.05, 4],
"to": [1.9, 3.05, 8.35],
"rotation": {"angle": -22.5, "axis": "y", "origin": [2.4, 0.8, 5.1]},
"faces": {
"north": {"uv": [2, 6.5, 1, 7.5], "texture": "#0"},
"east": {"uv": [5.75, 4, 3.5, 5], "texture": "#0"},
"south": {"uv": [3, 6.5, 2, 7.5], "texture": "#0"},
"west": {"uv": [6.25, 2.5, 4, 3.5], "texture": "#0"},
"up": {"uv": [0, 6.75, 1, 4.5], "texture": "#0"},
"down": {"uv": [3.5, 5, 4.5, 7.25], "texture": "#0"}
}
},
{
"from": [0.68934, 1.45, 1.88934],
"to": [5.18934, 3.45, 3.88934],
"rotation": {"angle": 22.5, "axis": "y", "origin": [2.93934, 2.45, 2.88934]},
"faces": {
"north": {"uv": [6.75, 0, 4.5, 1], "texture": "#0"},
"east": {"uv": [7.5, 6, 6.5, 7], "texture": "#0"},
"south": {"uv": [6.75, 5, 4.5, 6], "texture": "#0"},
"west": {"uv": [7.5, 2, 6.5, 3], "texture": "#0"},
"up": {"uv": [5.5, 2, 7.75, 1], "texture": "#0"},
"down": {"uv": [6, 3.5, 8.25, 4.5], "texture": "#0"}
}
},
{
"from": [4.09777, 2.92217, 0.9],
"to": [6.59777, 4.42217, 2.4],
"rotation": {"angle": 45, "axis": "z", "origin": [5.34777, 3.67217, 1.65]},
"faces": {
"north": {"uv": [8.25, 0, 7, 0.75], "texture": "#0"},
"east": {"uv": [2.75, 7.5, 2, 8.25], "texture": "#0"},
"south": {"uv": [5.75, 7, 4.5, 7.75], "texture": "#0"},
"west": {"uv": [1.75, 7.5, 1, 8.25], "texture": "#0"},
"up": {"uv": [7, 5.25, 8.25, 4.5], "texture": "#0"},
"down": {"uv": [6, 7, 7.25, 7.75], "texture": "#0"}
}
},
{
"from": [5.94777, 4.12217, 0.7],
"to": [7.04777, 6.62217, 1.8],
"rotation": {"angle": -22.5, "axis": "z", "origin": [6.49777, 5.37217, 1.25]},
"faces": {
"north": {"uv": [1.5, 4.5, 1, 5.75], "texture": "#0"},
"east": {"uv": [1, 7, 0.5, 8.25], "texture": "#0"},
"south": {"uv": [0.5, 7, 0, 8.25], "texture": "#0"},
"west": {"uv": [3.5, 6.5, 3, 7.75], "texture": "#0"},
"up": {"uv": [3, 3, 3.5, 2.5], "texture": "#0"},
"down": {"uv": [3.5, 2.5, 4, 3], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"scale": [0.5, 0.5, 0.5]
},
"thirdperson_lefthand": {
"scale": [0.5, 0.5, 0.5]
},
"head": {
"translation": [0, 10, -3.5],
"scale": [1.2, 1.2, 1.2]
}
},
"groups": [
{
"name": "L",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4, 5]
},
{
"name": "R",
"origin": [8, 8, 8],
"color": 0,
"children": [6, 7, 8, 9, 10, 11]
}
]
}
Binary file added ...t/general/vetements/cornes/small_cornes/small_cornes_bois/small_cornes_bois.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions .../cit/general/vetements/cornes/small_cornes/small_cornes_bois/small_cornes_bois.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=bone
model=corne
nbt.vetements=cornes_small_bois
Loading

0 comments on commit 90ff58e

Please sign in to comment.