Merge remote-tracking branch 'upstream/master'

Browse Source

# Conflicts:
#	core/assets/bundles/bundle_ja.properties

...

This commit is contained in:

beito123

2019-02-13 12:23:26 +09:00

parent ea9ed841ee 0ad89ebc04

commit 0851f2d0e2

1029 changed files with 34898 additions and 31253 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/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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/blast-drill-rim.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/blast-drill-top.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/blast-drill.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/laser-drill-rim.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/laser-drill-top.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/blocks/drills/laser-drill.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/plasma-drill-rim.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/plasma-drill-rotator.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/plasma-drill-top.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/plasma-drill.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/generic-cliff-side.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/grass-cliff-edge-1.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/grass-cliff-edge-2.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/grass-cliff-edge.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/grass-cliff-side.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

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