a rather large merge

Browse Source

...

This commit is contained in:

Anuken

2019-01-07 21:10:57 -05:00

parent 77b4f3e930 351b8c2469

commit fed964e0f7

169 changed files with 4143 additions and 4928 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

0

core/assets-raw/sprites/blocks/power/powerinfinite.png → core/assets-raw/sprites/blocks/power/power-source.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 139 B After Width:  |  Height:  |  Size: 139 B

0

core/assets-raw/sprites/blocks/power/powervoid.png → core/assets-raw/sprites/blocks/power/power-void.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 137 B After Width:  |  Height:  |  Size: 137 B

0

core/assets-raw/sprites/blocks/production/itemsource.png → core/assets-raw/sprites/blocks/production/item-source.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 116 B After Width:  |  Height:  |  Size: 116 B

0

core/assets-raw/sprites/blocks/production/itemvoid.png → core/assets-raw/sprites/blocks/production/item-void.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 219 B After Width:  |  Height:  |  Size: 219 B

0

core/assets-raw/sprites/blocks/production/liquidsource.png → core/assets-raw/sprites/blocks/production/liquid-source.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 119 B After Width:  |  Height:  |  Size: 119 B