Merge remote-tracking branch 'origin/master'

Browse source

...

This commit is contained in:

Ellpeck 2015-12-23 20:42:35 +01:00

parent 2ea19830fa da88d898b7

commit a712c1540c

19 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 Download patch file Download diff file Expand all files Collapse all files

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockBreakerTop.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPress.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 883 B After Width:  |  Height:  |  Size: 666 B

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockCanolaPressTop.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockCoalGenerator.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 527 B After Width:  |  Height:  |  Size: 692 B

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockCoalGeneratorBottom.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockCoalGeneratorTop.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockDropperTop.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockFluidCollectorTop.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockFluidPlacerTop.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDouble.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleFront.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 530 B After Width:  |  Height:  |  Size: 596 B

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleOn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 588 B After Width:  |  Height:  |  Size: 682 B

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleTop.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 708 B After Width:  |  Height:  |  Size: 685 B

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderBottom.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockItemRepairerBottom.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 490 B After Width:  |  Height:  |  Size: 661 B

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGeneratorBottom.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGeneratorTop.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/actuallyadditions/textures/blocks/blockPlacerTop.png

View file

Binary file not shown.

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