Compare commits

base: Ellpeck:d136820b380d13dc611050d4e819d5435dad76e5

Branches Tags

Ellpeck:main

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

..

compare: Ellpeck:a60d11dde085824e13b13a77228ed6bd689593ab

Branches Tags

Ellpeck:1.20.4

Ellpeck:1.20.1

Ellpeck:1.16

Ellpeck:main

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

No commits in common. "d136820b380d13dc611050d4e819d5435dad76e5" and "a60d11dde085824e13b13a77228ed6bd689593ab" have entirely different histories.

d136820b38 ... a60d11dde0

44 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Expand all files Collapse all files

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_diamatine.png → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 18 KiB

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_diamatine.png.mcmeta → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine.png.mcmeta

Unescape Escape View file

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_emeradic.png → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_emeradic.png.mcmeta → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic.png.mcmeta

Unescape Escape View file

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_enori.png → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 13 KiB

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_enori.png.mcmeta → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori.png.mcmeta

Unescape Escape View file

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_palis.png → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_palis.png.mcmeta → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis.png.mcmeta

Unescape Escape View file

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_restonia.png → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 17 KiB

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_restonia.png.mcmeta → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia.png.mcmeta

Unescape Escape View file

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_void.png → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 13 KiB

0

src/main/resources/assets/actuallyadditions/textures/block/unused/crystal_cluster_void.png.mcmeta → src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void.png.mcmeta

Unescape Escape View file

BIN

src/main/resources/assets/actuallyadditions/textures/block/diamatine_crystal_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 508 B After Width:  |  Height:  |  Size: 509 B

BIN

src/main/resources/assets/actuallyadditions/textures/block/empowered_diamatine_crystal_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 868 B After Width:  |  Height:  |  Size: 879 B

BIN

src/main/resources/assets/actuallyadditions/textures/block/models/diamatine_crystal.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 679 B After Width:  |  Height:  |  Size: 686 B

BIN

src/main/resources/assets/actuallyadditions/textures/block/models/emeradic_crystal.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 670 B After Width:  |  Height:  |  Size: 702 B

BIN

src/main/resources/assets/actuallyadditions/textures/block/models/enori_crystal.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 648 B After Width:  |  Height:  |  Size: 633 B

BIN

src/main/resources/assets/actuallyadditions/textures/block/models/palis_crystal.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 669 B After Width:  |  Height:  |  Size: 653 B

BIN

src/main/resources/assets/actuallyadditions/textures/block/models/void_crystal.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 635 B After Width:  |  Height:  |  Size: 611 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 373 B After Width:  |  Height:  |  Size: 378 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal_shard.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 308 B After Width:  |  Height:  |  Size: 299 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/double_battery.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 374 B After Width:  |  Height:  |  Size: 269 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_black.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 581 B After Width:  |  Height:  |  Size: 556 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_blue.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 603 B After Width:  |  Height:  |  Size: 559 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_brown.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 595 B After Width:  |  Height:  |  Size: 561 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_cyan.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 609 B After Width:  |  Height:  |  Size: 560 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_gray.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 605 B After Width:  |  Height:  |  Size: 554 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_green.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 604 B After Width:  |  Height:  |  Size: 550 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_light_blue.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 577 B After Width:  |  Height:  |  Size: 554 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_light_gray.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 597 B After Width:  |  Height:  |  Size: 555 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_lime.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 616 B After Width:  |  Height:  |  Size: 560 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_magenta.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 607 B After Width:  |  Height:  |  Size: 566 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_orange.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 606 B After Width:  |  Height:  |  Size: 564 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_pink.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 603 B After Width:  |  Height:  |  Size: 554 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_purple.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 608 B After Width:  |  Height:  |  Size: 566 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_red.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 600 B After Width:  |  Height:  |  Size: 547 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_white.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 585 B After Width:  |  Height:  |  Size: 559 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/drill_yellow.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 608 B After Width:  |  Height:  |  Size: 561 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/empowered_diamatine_crystal.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 619 B After Width:  |  Height:  |  Size: 605 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/quadruple_battery.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 481 B After Width:  |  Height:  |  Size: 357 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/quintuple_battery.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 447 B After Width:  |  Height:  |  Size: 397 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/single_battery.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 238 B

BIN

src/main/resources/assets/actuallyadditions/textures/item/snail.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1 KiB

BIN

src/main/resources/assets/actuallyadditions/textures/item/triple_battery.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 439 B After Width:  |  Height:  |  Size: 315 B