Merge branch 'master' into schematic

Browse Source

...

This commit is contained in:

J-VdS

2020-09-23 16:29:41 +02:00

committed by GitHub

parent 1e10817708 8ed83964a2

commit d0c6f3274b

563 changed files with 30174 additions and 22699 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/environment/ignarock1.png → core/assets-raw/sprites/blocks/environment/basalt1.png

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

0

core/assets-raw/sprites/blocks/environment/ignarock2.png → core/assets-raw/sprites/blocks/environment/basalt2.png

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

0

core/assets-raw/sprites/blocks/environment/ignarock3.png → core/assets-raw/sprites/blocks/environment/basalt3.png

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dacite-wall-large.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dacite-wall1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dacite-wall2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dacite1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dacite2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dacite3.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dirt-wall-large.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dirt-wall1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dirt-wall2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dirt1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dirt2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dirt3.png Normal file

Binary file not shown.

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

0

core/assets-raw/sprites/blocks/environment/dunerocks-large.png → core/assets-raw/sprites/blocks/environment/dune-wall-large.png

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

0

core/assets-raw/sprites/blocks/environment/dunerocks1.png → core/assets-raw/sprites/blocks/environment/dune-wall1.png

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

0

core/assets-raw/sprites/blocks/environment/dunerocks2.png → core/assets-raw/sprites/blocks/environment/dune-wall2.png

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

0

core/assets-raw/sprites/blocks/environment/icerocks-large.png → core/assets-raw/sprites/blocks/environment/ice-wall-large.png

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

0

core/assets-raw/sprites/blocks/environment/icerocks1.png → core/assets-raw/sprites/blocks/environment/ice-wall1.png

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

0

core/assets-raw/sprites/blocks/environment/icerocks2.png → core/assets-raw/sprites/blocks/environment/ice-wall2.png

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

BIN

core/assets-raw/sprites/blocks/environment/metal-floor-3.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/mud1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/mud2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/mud3.png Normal file

Binary file not shown.

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

0

core/assets-raw/sprites/blocks/environment/saltrocks-large.png → core/assets-raw/sprites/blocks/environment/salt-wall-large.png

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

0

core/assets-raw/sprites/blocks/environment/saltrocks1.png → core/assets-raw/sprites/blocks/environment/salt-wall1.png

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

0

core/assets-raw/sprites/blocks/environment/saltrocks2.png → core/assets-raw/sprites/blocks/environment/salt-wall2.png

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

0

core/assets-raw/sprites/blocks/environment/sandrocks-large.png → core/assets-raw/sprites/blocks/environment/sand-wall-large.png

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

0

core/assets-raw/sprites/blocks/environment/sandrocks1.png → core/assets-raw/sprites/blocks/environment/sand-wall1.png

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

0

core/assets-raw/sprites/blocks/environment/sandrocks2.png → core/assets-raw/sprites/blocks/environment/sand-wall2.png

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

0

core/assets-raw/sprites/blocks/environment/shalerocks-large.png → core/assets-raw/sprites/blocks/environment/shale-wall-large.png

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

0

core/assets-raw/sprites/blocks/environment/shalerocks1.png → core/assets-raw/sprites/blocks/environment/shale-wall1.png

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

0

core/assets-raw/sprites/blocks/environment/shalerocks2.png → core/assets-raw/sprites/blocks/environment/shale-wall2.png

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

0

core/assets-raw/sprites/blocks/environment/snowrocks-large.png → core/assets-raw/sprites/blocks/environment/snow-wall-large.png

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

0

core/assets-raw/sprites/blocks/environment/snowrocks1.png → core/assets-raw/sprites/blocks/environment/snow-wall1.png

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

0

core/assets-raw/sprites/blocks/environment/snowrocks2.png → core/assets-raw/sprites/blocks/environment/snow-wall2.png

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

0

core/assets-raw/sprites/blocks/environment/sporerocks-large.png → core/assets-raw/sprites/blocks/environment/spore-wall-large.png

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

0

core/assets-raw/sprites/blocks/environment/sporerocks1.png → core/assets-raw/sprites/blocks/environment/spore-wall1.png

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

0

core/assets-raw/sprites/blocks/environment/sporerocks2.png → core/assets-raw/sprites/blocks/environment/spore-wall2.png

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

0

core/assets-raw/sprites/blocks/environment/rocks-large.png → core/assets-raw/sprites/blocks/environment/stone-wall-large.png

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

0

core/assets-raw/sprites/blocks/environment/rocks1.png → core/assets-raw/sprites/blocks/environment/stone-wall1.png

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

0

core/assets-raw/sprites/blocks/environment/rocks2.png → core/assets-raw/sprites/blocks/environment/stone-wall2.png

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/logic/large-logic-display.png Normal file

Binary file not shown.

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

0

core/assets-raw/sprites/blocks/power/turbine-generator-cap.png → core/assets-raw/sprites/blocks/power/steam-generator-cap.png

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

0

core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png → core/assets-raw/sprites/blocks/power/steam-generator-liquid.png

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

0

core/assets-raw/sprites/blocks/power/turbine-generator-top.png → core/assets-raw/sprites/blocks/power/steam-generator-top.png

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

0

core/assets-raw/sprites/blocks/power/turbine-generator-turbine0.png → core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png

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

0

core/assets-raw/sprites/blocks/power/turbine-generator-turbine1.png → core/assets-raw/sprites/blocks/power/steam-generator-turbine1.png

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

0

core/assets-raw/sprites/blocks/power/turbine-generator.png → core/assets-raw/sprites/blocks/power/steam-generator.png

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

0

core/assets-raw/sprites/blocks/props/rock1.png → core/assets-raw/sprites/blocks/props/boulder1.png

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

0

core/assets-raw/sprites/blocks/props/rock2.png → core/assets-raw/sprites/blocks/props/boulder2.png

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

BIN

core/assets-raw/sprites/blocks/props/dacite-boulder1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/props/dacite-boulder2.png Normal file

Binary file not shown.

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

0

core/assets-raw/sprites/blocks/props/snowrock1.png → core/assets-raw/sprites/blocks/props/snow-boulder1.png

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

0

core/assets-raw/sprites/blocks/props/snowrock2.png → core/assets-raw/sprites/blocks/props/snow-boulder2.png

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

BIN

core/assets-raw/sprites/blocks/storage/container-team.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/storage/container.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/storage/vault-team.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/storage/vault.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/swarmer.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/units/command-center.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/effects/large-bomb-back.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/effects/large-bomb.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/bryde.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/chaos-array-cell.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/chaos-array-leg.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/chaos-array.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus-base.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus-foot.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus-joint-base.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus-joint.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus-leg-base.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus-leg.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus-weapon-heat.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/corvus.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/dagger-leg.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/eradicator-base.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/eradicator-cell.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/eradicator-leg.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/eradicator.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/gamma.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/mace-leg.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/mega.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/minke.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/oct-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/oct.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/omura-cannon-heat.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/omura-cell.png Normal file

Binary file not shown.

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

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