Merge branch 'mc1.17/dev' into mc1.18/dev

Browse source

...

This commit is contained in:

simibubi 2021-12-08 02:21:27 +01:00

parent 62b3a0491a b6c66868ca

commit b40901621a

28 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/create/textures/block/palettes/stone_types/pillar/andesite_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 664 B After Width:  |  Height:  |  Size: 6.5 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/andesite_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/asurine_cut_pillar.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/asurine_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/calcite_cut_pillar.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/calcite_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/crimsite_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 658 B After Width:  |  Height:  |  Size: 6.4 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/crimsite_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/deepslate_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 662 B After Width:  |  Height:  |  Size: 6.2 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/deepslate_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/diorite_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 651 B After Width:  |  Height:  |  Size: 6.3 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/diorite_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/dripstone_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 650 B After Width:  |  Height:  |  Size: 6.3 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/dripstone_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/granite_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 637 B After Width:  |  Height:  |  Size: 6.3 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/granite_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/limestone_cut_pillar.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/limestone_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/ochrum_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 688 B After Width:  |  Height:  |  Size: 6.5 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/ochrum_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/scorchia_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 662 B After Width:  |  Height:  |  Size: 6.2 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/scorchia_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/scoria_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 658 B After Width:  |  Height:  |  Size: 6.3 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/scoria_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/tuff_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 656 B After Width:  |  Height:  |  Size: 6.5 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/tuff_cut_pillar_connected.png

View file

Binary file not shown.

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

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/veridium_cut_pillar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 697 B After Width:  |  Height:  |  Size: 6.5 KiB

BIN

src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/veridium_cut_pillar_connected.png

View file

Binary file not shown.

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