Merge branch 'master' into zh-TW

Browse Source

...

This commit is contained in:

Anuken

2019-02-08 12:04:43 -05:00

committed by GitHub

parent c2bed82db5 274ef166ef

commit 5094a6fc49

548 changed files with 10925 additions and 8251 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/distribution/mass-driver.png → core/assets-raw/sprites/blocks/distribution/mass-driver-base.png

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

core/assets-raw/sprites/blocks/distribution/warp-gate-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/warp-gate.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/differential-generator-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/differential-generator.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/edge-stencil-blocky.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/edge-stencil-smooth.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/ice-edge.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/ice-snow1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/ice-snow2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/ice-snow3.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/spore-cluster1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/spore-cluster2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/spore-cluster3.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stained-rocks-large.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stained-rocks-red-large.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stained-rocks-red1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stained-rocks-red2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stained-rocks-yellow-large.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stained-rocks-yellow1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stained-rocks-yellow2.png

BIN

Binary file not shown.

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

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