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:4aeb9bd34f3abc1085a060ba63abc5922ba77d9f
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:d95442957e9d21b23e6880b2bcb49c5e2d55611f
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. "4aeb9bd34f3abc1085a060ba63abc5922ba77d9f" and "d95442957e9d21b23e6880b2bcb49c5e2d55611f" have entirely different histories.
4aeb9bd34f ... d95442957e

45 changed files with 13 additions and 22 deletions
Show stats Expand all files Collapse all files

5
src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json
View file

@ -1,7 +1,6 @@
{ {
"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",
@ -142,7 +141,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": "#3"}, "south": {"uv": [1, 1, 15, 15], "texture": "#base"},
"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"}
@ -152,7 +151,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": "#3"}, "north": {"uv": [1, 1, 15, 15], "texture": "#base"},
"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"},

3
src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json
View file

@ -3,7 +3,6 @@
"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",
@ -233,7 +232,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": "#5"}, "south": {"uv": [1, 1, 15, 16], "texture": "#base"},
"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"}

6
src/main/resources/assets/actuallyadditions/models/block/farmer.json
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/base_texture_vent" "side": "actuallyadditions:block/farmer_side",
"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": "#base"}, "west": {"uv": [2, 1, 14, 16], "texture": "#side"},
"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"}
} }

3
src/main/resources/assets/actuallyadditions/models/block/laser_relay.json
View file

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

3
src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json
View file

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

3
src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json
View file

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

3
src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json
View file

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

3
src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json
View file

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

3
src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json
View file

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

3
src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json
View file

@ -3,7 +3,6 @@
"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",
@ -150,7 +149,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": "#5"}, "east": {"uv": [2, 1, 14, 16], "texture": "#base"},
"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"}

BIN
src/main/resources/assets/actuallyadditions/textures/block/farmer_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 381 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_black.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_black.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 266 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 370 B

After

Width:  |  Height:  |  Size: 265 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_blue.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_blue.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 287 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 301 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_brown.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_brown.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 306 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 298 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_cyan.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 301 B

After

Width:  |  Height:  |  Size: 301 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 306 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_gray.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_gray.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 281 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 289 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_green.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_green.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 278 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 301 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_blue.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 295 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 277 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_gray.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 280 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 286 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_lime.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_lime.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 305 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 305 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_magenta.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 309 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_orange.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_orange.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 301 B

After

Width:  |  Height:  |  Size: 301 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 304 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_pink.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_pink.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 296 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_purple.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_purple.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 307 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_red.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_red.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 298 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 308 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_white.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_white.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 284 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 288 B

0
src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_yellow.png → src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 301 B

After

Width:  |  Height:  |  Size: 301 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 293 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 454 B

BIN
src/main/resources/assets/actuallyadditions/textures/block/phantomface_placer.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 490 B

After

Width:  |  Height:  |  Size: 453 B