Merge + update

Browse Source

...

This commit is contained in:

Anuken

2019-06-30 14:13:13 -04:00

parent 1fe30bc466 c77f51b7ae

commit 1c530a6c7a

214 changed files with 11773 additions and 8613 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

BIN

core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/pebbles1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 199 B After Width:  |  Height:  |  Size: 1.9 KiB

BIN

core/assets-raw/sprites/blocks/environment/pebbles2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 224 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites/blocks/environment/pebbles3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 203 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites/blocks/environment/rock1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 358 B After Width:  |  Height:  |  Size: 4.5 KiB

BIN

core/assets-raw/sprites/blocks/environment/rock2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 389 B After Width:  |  Height:  |  Size: 4.5 KiB

BIN

core/assets-raw/sprites/blocks/environment/sand1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 1.7 KiB

BIN

core/assets-raw/sprites/blocks/environment/shale-boulder1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 253 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites/blocks/environment/shale-boulder2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 268 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites/blocks/environment/snowrock1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 347 B After Width:  |  Height:  |  Size: 5.3 KiB

BIN

core/assets-raw/sprites/blocks/environment/snowrock2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 347 B After Width:  |  Height:  |  Size: 5.5 KiB

BIN

core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 138 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 201 B After Width:  |  Height:  |  Size: 1.7 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 165 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 165 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 175 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 127 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-bottom.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/conduit-top-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 295 B After Width:  |  Height:  |  Size: 2.2 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-top-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 461 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-top-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 276 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-top-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 273 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-top-4.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 278 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-top-5.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 427 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites/blocks/liquid/conduit-top-6.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 291 B After Width:  |  Height:  |  Size: 2.2 KiB

BIN

core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 111 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 464 B After Width:  |  Height:  |  Size: 2.4 KiB

BIN

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 541 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 310 B After Width:  |  Height:  |  Size: 2.2 KiB

BIN

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 331 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 294 B After Width:  |  Height:  |  Size: 2.2 KiB

BIN

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 280 B After Width:  |  Height:  |  Size: 2.4 KiB

BIN

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 317 B After Width:  |  Height:  |  Size: 2.4 KiB

BIN

core/assets-raw/sprites/blocks/turrets/bases/block-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 196 B After Width:  |  Height:  |  Size: 1.8 KiB

BIN

core/assets-raw/sprites/blocks/turrets/bases/block-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 339 B After Width:  |  Height:  |  Size: 2.8 KiB

BIN

core/assets-raw/sprites/blocks/turrets/bases/block-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 567 B After Width:  |  Height:  |  Size: 4.6 KiB

BIN

core/assets-raw/sprites/blocks/turrets/bases/block-4.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 889 B After Width:  |  Height:  |  Size: 5.3 KiB

BIN

core/assets-raw/sprites/ui/button-over.9.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 202 B After Width:  |  Height:  |  Size: 4.8 KiB

BIN

core/assets-raw/sprites/ui/button-s.9.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/button.9.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-crafting.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-defense.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-distribution.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-effect.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-liquid.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-power.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-production.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-turret.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-units.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons-category/icon-upgrade.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/controller-cursor.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-admin.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 148 B After Width:  |  Height:  |  Size: 3.7 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-areaDelete.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-cancel-2.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-check-2.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-check.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 157 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-crafting.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-database-small.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-database.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-defense.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-dev-builds.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 135 B After Width:  |  Height:  |  Size: 3.5 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-distribution.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-donate.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 143 B After Width:  |  Height:  |  Size: 3.6 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-editor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 136 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-effect.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-egg.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-eraser.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 126 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-generated.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-github.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 143 B After Width:  |  Height:  |  Size: 3.0 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-google-play.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-hold.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-holdDelete.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-info.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-itch.io.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 138 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-items-none.png

Binary file not shown.

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

0

core/assets-raw/sprites/ui/icons/icon-liquid-small.png → core/assets-raw/sprites/ui/icons/icon-liquid-consume.png

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

BIN

core/assets-raw/sprites/ui/icons/icon-liquid.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-loading.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-locked.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-logic.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-map.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-mission-background.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-mission-battle.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-mission-defense.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-mission-done.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-pencil-small.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-pencil.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 135 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-pick.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 131 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-power-requirement.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-power-small.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-power.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-production.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-redo.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 127 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-refresh.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 120 B After Width:  |  Height:  |  Size: 3.9 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-terrain.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 138 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-tools.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 150 B After Width:  |  Height:  |  Size: 4.5 KiB

BIN

core/assets-raw/sprites/ui/icons/icon-touch.png

Binary file not shown.

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

Some files were not shown because too many files have changed in this diff Show More