Merge

Browse Source

...

This commit is contained in:

Anuken

2018-11-21 10:04:17 -05:00

parent 00706daae5 03ff33acaf

commit 1f955904a4

82 changed files with 2417 additions and 2577 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/production/alloy-fuser.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/text-sides-down.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/text-sides-over.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/text-sides.png

BIN

Binary file not shown.

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