WIP branch merging

Browse Source

...

This commit is contained in:

Anuken

2021-10-14 19:15:03 -04:00

parent b30eb26eb7

commit ad1c75d050

38 changed files with 502 additions and 169 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

core/assets-raw/sprites/blocks/payload/block-forge.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

core/assets-raw/sprites/blocks/payload/block-loader.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB

core/assets-raw/sprites/blocks/payload/block-unloader.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 895 B

core/assets-raw/sprites/blocks/payload/constructor-top.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

core/assets-raw/sprites/blocks/payload/constructor.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

core/assets-raw/sprites/blocks/payload/deconstructor-top.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

core/assets-raw/sprites/blocks/payload/deconstructor.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

core/assets-raw/sprites/blocks/payload/factory-in-3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 655 B

core/assets-raw/sprites/blocks/units/factory-in-5.png → core/assets-raw/sprites/blocks/payload/factory-in-5.png

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

core/assets-raw/sprites/blocks/units/factory-in-7.png → core/assets-raw/sprites/blocks/payload/factory-in-7.png

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

core/assets-raw/sprites/blocks/units/factory-in-9.png → core/assets-raw/sprites/blocks/payload/factory-in-9.png

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

core/assets-raw/sprites/blocks/payload/factory-out-3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 609 B

core/assets-raw/sprites/blocks/units/factory-out-5.png → core/assets-raw/sprites/blocks/payload/factory-out-5.png

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

core/assets-raw/sprites/blocks/units/factory-out-7.png → core/assets-raw/sprites/blocks/payload/factory-out-7.png

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

core/assets-raw/sprites/blocks/units/factory-out-9.png → core/assets-raw/sprites/blocks/payload/factory-out-9.png

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

core/assets-raw/sprites/blocks/units/factory-top-3.png → core/assets-raw/sprites/blocks/payload/factory-top-3.png

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

core/assets-raw/sprites/blocks/units/factory-top-5.png → core/assets-raw/sprites/blocks/payload/factory-top-5.png

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

core/assets-raw/sprites/blocks/payload/large-constructor-top.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

core/assets-raw/sprites/blocks/payload/large-constructor.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

core/assets-raw/sprites/blocks/payload/payload-loader-top.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

core/assets-raw/sprites/blocks/payload/payload-loader.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

core/assets-raw/sprites/blocks/payload/payload-source.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/payload/payload-unloader-top.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

core/assets-raw/sprites/blocks/payload/payload-unloader.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

core/assets-raw/sprites/blocks/units/factory-in-3.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.4 KiB

core/assets-raw/sprites/blocks/units/factory-out-3.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 651 B