Merge branch 'master' into GH-v80

Browse Source

...

This commit is contained in:

(G_H)

2019-06-23 21:07:06 +08:00

committed by GitHub

parent 22e12ce3e5 8c91aca838

commit aa84eefa8f

1849 changed files with 96454 additions and 39768 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/fonts/Exo2-Regular.ttf

BIN

Binary file not shown.

core/assets-raw/fonts/NanumBarunGothic.ttf

BIN

Binary file not shown.

core/assets-raw/fonts/OpenSansEmoji.ttf

BIN

Binary file not shown.

core/assets-raw/fonts/font_latin.ttf

BIN

Binary file not shown.

core/assets-raw/sprites/backgrounds/background.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blank.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/blackstoneblock1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/blackstoneblock2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/blackstoneblock3.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/block-2x2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/block-3x3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/block-middle.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/block.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/chainturret-icon.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/chainturret-icon_old.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/chainturret.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/chainturret_old.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/coal1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/coal2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/coal3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/coaldrill.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/coalgenerator-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/coalgenerator.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/coalpurifier.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/combustiongenerator.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/compositewall.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/conduit.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/conduitbottom.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/conduitliquid.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/conduittop.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/conveyor.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/conveyormove.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/conveyortunnel.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/cross.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/crucible.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/force-projector-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/force-projector.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/mend-projector-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/mend-projector.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/mender-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/mender.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/overdrive-projector.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/defense/shock-mine.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/bridge-arrow.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/center.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png

BIN

Binary file not shown.

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

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