Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-28 09:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:9eec468f7c878fdc3d327cb5597ed319e245035b
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7
..
compare: Ellpeck:7c91da5a0297a14dce6831ad3476d1b1f1247f73
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7

No commits in common. "9eec468f7c878fdc3d327cb5597ed319e245035b" and "7c91da5a0297a14dce6831ad3476d1b1f1247f73" have entirely different histories.
9eec468f7c ... 7c91da5a02

3 changed files with 17 additions and 17 deletions
Show stats Expand all files Collapse all files

BIN
pics/new_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
pics/page_icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 51 KiB

34
src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface.json
View file

@ -16,7 +16,7 @@
"east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#inside"}, "east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#inside"},
"south": {"uv": [0, 15, 16, 16], "texture": "#inside"}, "south": {"uv": [0, 15, 16, 16], "texture": "#inside"},
"west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#inside"}, "west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#inside"},
"up": {"uv": [0, 0, 16, 16], "texture": "#inside"}, "up": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "up"},
"down": {"uv": [16, 0, 0, 16], "rotation": 180, "texture": "#base"} "down": {"uv": [16, 0, 0, 16], "rotation": 180, "texture": "#base"}
} }
}, },
@ -24,11 +24,11 @@
"from": [1, 11, 1], "from": [1, 11, 1],
"to": [2, 15, 15], "to": [2, 15, 15],
"faces": { "faces": {
"north": {"uv": [14, 0, 15, 4], "texture": "#side"}, "north": {"uv": [14, 0, 15, 4], "texture": "#side", "cullface": "east"},
"east": {"uv": [1, 4, 15, 8], "texture": "#side"}, "east": {"uv": [1, 4, 15, 8], "texture": "#side", "cullface": "east"},
"south": {"uv": [14, 4, 15, 8], "texture": "#side"}, "south": {"uv": [14, 4, 15, 8], "texture": "#side", "cullface": "east"},
"west": {"uv": [1, 4, 15, 8], "texture": "#side"}, "west": {"uv": [1, 4, 15, 8], "texture": "#side", "cullface": "east"},
"up": {"uv": [15, 4, 1, 5], "rotation": 90, "texture": "#side"} "up": {"uv": [15, 4, 1, 5], "rotation": 90, "texture": "#side", "cullface": "up"}
} }
}, },
{ {
@ -36,20 +36,20 @@
"to": [15, 15, 15], "to": [15, 15, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [13, 0, 0]}, "rotation": {"angle": 0, "axis": "y", "origin": [13, 0, 0]},
"faces": { "faces": {
"north": {"uv": [1, 0, 2, 4], "texture": "#side"}, "north": {"uv": [1, 0, 2, 4], "texture": "#side", "cullface": "east"},
"east": {"uv": [1, 4, 15, 8], "texture": "#side"}, "east": {"uv": [1, 4, 15, 8], "texture": "#side", "cullface": "east"},
"south": {"uv": [14, 4, 15, 8], "texture": "#side"}, "south": {"uv": [14, 4, 15, 8], "texture": "#side", "cullface": "east"},
"west": {"uv": [1, 4, 15, 8], "texture": "#side"}, "west": {"uv": [1, 4, 15, 8], "texture": "#side", "cullface": "east"},
"up": {"uv": [1, 4, 15, 5], "rotation": 90, "texture": "#side"} "up": {"uv": [1, 4, 15, 5], "rotation": 90, "texture": "#side", "cullface": "up"}
} }
}, },
{ {
"from": [2, 11, 1], "from": [2, 11, 1],
"to": [14, 15, 2], "to": [14, 15, 2],
"faces": { "faces": {
"north": {"uv": [14, 0, 2, 4], "texture": "#side"}, "north": {"uv": [14, 0, 2, 4], "texture": "#side", "cullface": "east"},
"south": {"uv": [2, 0, 14, 4], "texture": "#side"}, "south": {"uv": [2, 0, 14, 4], "texture": "#side", "cullface": "east"},
"up": {"uv": [2, 0, 14, 1], "texture": "#side"} "up": {"uv": [2, 0, 14, 1], "texture": "#side", "cullface": "up"}
} }
}, },
{ {
@ -57,9 +57,9 @@
"to": [14, 15, 15], "to": [14, 15, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]},
"faces": { "faces": {
"north": {"uv": [14, 0, 2, 4], "texture": "#side"}, "north": {"uv": [14, 0, 2, 4], "texture": "#side", "cullface": "east"},
"south": {"uv": [2, 0, 14, 4], "texture": "#side"}, "south": {"uv": [2, 0, 14, 4], "texture": "#side", "cullface": "east"},
"up": {"uv": [2, 0, 14, 1], "texture": "#side"} "up": {"uv": [2, 0, 14, 1], "texture": "#side", "cullface": "up"}
} }
}, },
{ {