Compare commits

..

No commits in common. "4aeb9bd34f3abc1085a060ba63abc5922ba77d9f" and "d95442957e9d21b23e6880b2bcb49c5e2d55611f" have entirely different histories.

45 changed files with 13 additions and 22 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 370 B

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 305 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 309 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 304 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 293 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 454 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 490 B

After

Width:  |  Height:  |  Size: 453 B