Merge pull request #1396 from Ridanisaurus/1.20.4

Retexture 2.1
This commit is contained in:
Mrbysco 2024-04-05 18:55:41 +02:00 committed by GitHub
commit 4aeb9bd34f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 22 additions and 13 deletions

View file

@ -1,6 +1,7 @@
{ {
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"3": "actuallyadditions:block/base_texture_arrow",
"base": "actuallyadditions:block/base_texture", "base": "actuallyadditions:block/base_texture",
"particle": "actuallyadditions:block/atomic_reconstructor_front", "particle": "actuallyadditions:block/atomic_reconstructor_front",
"front": "actuallyadditions:block/atomic_reconstructor_front", "front": "actuallyadditions:block/atomic_reconstructor_front",
@ -141,7 +142,7 @@
"faces": { "faces": {
"north": {"uv": [1, 1, 15, 15], "texture": "#base"}, "north": {"uv": [1, 1, 15, 15], "texture": "#base"},
"east": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#base"}, "east": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#base"},
"south": {"uv": [1, 1, 15, 15], "texture": "#base"}, "south": {"uv": [1, 1, 15, 15], "texture": "#3"},
"west": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#base"}, "west": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#base"},
"up": {"uv": [1, 1, 15, 2], "texture": "#base"}, "up": {"uv": [1, 1, 15, 2], "texture": "#base"},
"down": {"uv": [1, 1, 15, 2], "texture": "#base"} "down": {"uv": [1, 1, 15, 2], "texture": "#base"}
@ -151,7 +152,7 @@
"from": [1, 1, 1], "from": [1, 1, 1],
"to": [15, 15, 2], "to": [15, 15, 2],
"faces": { "faces": {
"north": {"uv": [1, 1, 15, 15], "texture": "#base"}, "north": {"uv": [1, 1, 15, 15], "texture": "#3"},
"east": {"uv": [1, 14, 15, 15], "rotation": 270, "texture": "#base"}, "east": {"uv": [1, 14, 15, 15], "rotation": 270, "texture": "#base"},
"south": {"uv": [1, 1, 15, 15], "texture": "#base"}, "south": {"uv": [1, 1, 15, 15], "texture": "#base"},
"west": {"uv": [1, 14, 15, 15], "rotation": 90, "texture": "#base"}, "west": {"uv": [1, 14, 15, 15], "rotation": 90, "texture": "#base"},

View file

@ -3,6 +3,7 @@
"textures": { "textures": {
"3": "actuallyadditions:block/base_texture_small", "3": "actuallyadditions:block/base_texture_small",
"4": "actuallyadditions:block/bioreactor_top_animation", "4": "actuallyadditions:block/bioreactor_top_animation",
"5": "actuallyadditions:block/base_texture_vent",
"base": "actuallyadditions:block/base_texture", "base": "actuallyadditions:block/base_texture",
"particle": "actuallyadditions:block/bioreactor_side", "particle": "actuallyadditions:block/bioreactor_side",
"side": "actuallyadditions:block/bioreactor_side", "side": "actuallyadditions:block/bioreactor_side",
@ -232,7 +233,7 @@
"faces": { "faces": {
"north": {"uv": [0, 0, 14, 15], "texture": "#base"}, "north": {"uv": [0, 0, 14, 15], "texture": "#base"},
"east": {"uv": [1, 1, 2, 16], "texture": "#base"}, "east": {"uv": [1, 1, 2, 16], "texture": "#base"},
"south": {"uv": [1, 1, 15, 16], "texture": "#base"}, "south": {"uv": [1, 1, 15, 16], "texture": "#5"},
"west": {"uv": [14, 1, 15, 16], "texture": "#base"}, "west": {"uv": [14, 1, 15, 16], "texture": "#base"},
"up": {"uv": [1, 14, 15, 15], "texture": "#base"}, "up": {"uv": [1, 14, 15, 15], "texture": "#base"},
"down": {"uv": [1, 14, 15, 15], "texture": "#base", "cullface": "down"} "down": {"uv": [1, 14, 15, 15], "texture": "#base", "cullface": "down"}

View file

@ -5,9 +5,9 @@
"5": "actuallyadditions:block/farmer_top_animation", "5": "actuallyadditions:block/farmer_top_animation",
"7": "actuallyadditions:block/farmer_front_animation", "7": "actuallyadditions:block/farmer_front_animation",
"8": "actuallyadditions:block/base_texture_back", "8": "actuallyadditions:block/base_texture_back",
"particle": "actuallyadditions:block/base_texture_small",
"base": "actuallyadditions:block/base_texture", "base": "actuallyadditions:block/base_texture",
"side": "actuallyadditions:block/farmer_side", "side": "actuallyadditions:block/base_texture_vent"
"particle": "actuallyadditions:block/base_texture_small"
}, },
"elements": [ "elements": [
{ {
@ -223,7 +223,7 @@
"to": [2, 15, 14], "to": [2, 15, 14],
"faces": { "faces": {
"east": {"uv": [0, 0, 12, 15], "texture": "#missing"}, "east": {"uv": [0, 0, 12, 15], "texture": "#missing"},
"west": {"uv": [2, 1, 14, 16], "texture": "#side"}, "west": {"uv": [2, 1, 14, 16], "texture": "#base"},
"up": {"uv": [1, 2, 2, 14], "texture": "#base"}, "up": {"uv": [1, 2, 2, 14], "texture": "#base"},
"down": {"uv": [14, 2, 15, 14], "texture": "#base", "cullface": "down"} "down": {"uv": [14, 2, 15, 14], "texture": "#base", "cullface": "down"}
} }

View file

@ -337,7 +337,8 @@
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625] "translation": [0, 1.75, 0],
"scale": [0.8, 0.8, 0.8]
}, },
"fixed": { "fixed": {
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]

View file

@ -337,7 +337,8 @@
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625] "translation": [0, 1.75, 0],
"scale": [0.8, 0.8, 0.8]
}, },
"fixed": { "fixed": {
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]

View file

@ -337,7 +337,8 @@
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625] "translation": [0, 1.75, 0],
"scale": [0.8, 0.8, 0.8]
}, },
"fixed": { "fixed": {
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]

View file

@ -337,7 +337,8 @@
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625] "translation": [0, 1.75, 0],
"scale": [0.8, 0.8, 0.8]
}, },
"fixed": { "fixed": {
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]

View file

@ -337,7 +337,8 @@
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625] "translation": [0, 1.75, 0],
"scale": [0.8, 0.8, 0.8]
}, },
"fixed": { "fixed": {
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]

View file

@ -337,7 +337,8 @@
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625] "translation": [0, 1.75, 0],
"scale": [0.8, 0.8, 0.8]
}, },
"fixed": { "fixed": {
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]

View file

@ -3,6 +3,7 @@
"textures": { "textures": {
"3": "actuallyadditions:block/base_texture_large", "3": "actuallyadditions:block/base_texture_large",
"4": "actuallyadditions:block/leaf_gen_animated", "4": "actuallyadditions:block/leaf_gen_animated",
"5": "actuallyadditions:block/base_texture_vent",
"base": "actuallyadditions:block/base_texture", "base": "actuallyadditions:block/base_texture",
"front": "actuallyadditions:block/base_texture_back", "front": "actuallyadditions:block/base_texture_back",
"particle": "actuallyadditions:block/leaf_gen_front", "particle": "actuallyadditions:block/leaf_gen_front",
@ -149,7 +150,7 @@
"from": [14, 0, 2], "from": [14, 0, 2],
"to": [15, 15, 14], "to": [15, 15, 14],
"faces": { "faces": {
"east": {"uv": [2, 1, 14, 16], "texture": "#base"}, "east": {"uv": [2, 1, 14, 16], "texture": "#5"},
"west": {"uv": [0, 0, 12, 15], "texture": "#base"}, "west": {"uv": [0, 0, 12, 15], "texture": "#base"},
"up": {"uv": [1, 2, 2, 14], "texture": "#base"}, "up": {"uv": [1, 2, 2, 14], "texture": "#base"},
"down": {"uv": [2, 1, 14, 2], "rotation": 270, "texture": "#base", "cullface": "down"} "down": {"uv": [2, 1, 14, 2], "rotation": 270, "texture": "#base", "cullface": "down"}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

After

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 372 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

After

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 361 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 380 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 371 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 374 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

After

Width:  |  Height:  |  Size: 361 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 B

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 453 B

After

Width:  |  Height:  |  Size: 490 B