Merge

Browse Source

...

This commit is contained in:

Anuken

2020-01-18 11:16:03 -05:00

parent b20e0967fd 95352e1729

commit f044f30829

236 changed files with 6310 additions and 6330 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/production/separator-liquid.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 179 B

BIN

core/assets-raw/sprites/blocks/production/separator-spinner.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/production/separator.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.1 KiB After Width:  |  Height:  |  Size: 679 B

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-arrow-16.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-arrow-down.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-arrow-left.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-arrow-right.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-arrow-up.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-command-attack.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-command-patrol.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-command-rally.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-command-retreat.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-f-droid.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-floppy-16.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-folder-parent.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-load-image.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-menu-large.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-mode-attack.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-mode-pvp.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-mode-survival.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-rotate-arrow.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-rotate-left.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-rotate-right.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-save-image.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

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