Merge remote-tracking branch 'upstream/master'

Browse Source

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

...

This commit is contained in:

beito123

2019-03-06 14:59:38 +09:00

parent dbbc72d00f a5d1350815

commit f5866d7f72

297 changed files with 6811 additions and 5952 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/drills/oil-extractor-top.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/oil-extractor.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/mechanical-pump.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 148 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

core/assets-raw/sprites/blocks/liquid/thermal-pump.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 258 B After Width:  |  Height:  |  Size: 6.3 KiB

BIN

core/assets-raw/sprites/blocks/power/impact-reactor-top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 481 B After Width:  |  Height:  |  Size: 4.4 KiB

BIN

core/assets-raw/sprites/blocks/production/biomattercompressor-frame0.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/production/biomattercompressor-frame1.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/production/biomattercompressor-frame2.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/production/cultivator-top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 219 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/production/plastanium-compressor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 250 B After Width:  |  Height:  |  Size: 1.8 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 250 B After Width:  |  Height:  |  Size: 1.8 KiB

BIN

core/assets-raw/sprites/blocks/production/spore-press-frame0.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/production/spore-press-frame1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/production/spore-press-frame2.png Normal file

Binary file not shown.

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

0

core/assets-raw/sprites/blocks/production/biomattercompressor-liquid.png → core/assets-raw/sprites/blocks/production/spore-press-liquid.png

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

0

core/assets-raw/sprites/blocks/production/biomattercompressor-top.png → core/assets-raw/sprites/blocks/production/spore-press-top.png

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

BIN

core/assets-raw/sprites/blocks/production/spore-press.png Normal file

Binary file not shown.

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

0

core/assets-raw/sprites/blocks/units/repair-point-turret.png → core/assets-raw/sprites/blocks/units/repair-point.png

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

BIN

core/assets-raw/sprites/effects/beam-end.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/effects/beam.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/effects/laser-end.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/effects/laser.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/effects/laserfull.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/effects/minelaser-end.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/effects/minelaser.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 145 B After Width:  |  Height:  |  Size: 1.2 KiB

BIN

core/assets-raw/sprites/ui/button-right-down.9.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 153 B After Width:  |  Height:  |  Size: 1.9 KiB

BIN

core/assets-raw/sprites/ui/button-right-over.9.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 169 B After Width:  |  Height:  |  Size: 3.4 KiB

BIN

core/assets-raw/sprites/ui/button-right.9.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 4.1 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/alpha-drone.png

Binary file not shown.

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

0

core/assets-raw/sprites/mechs/mechs/chaos-array-base.png → core/assets-raw/sprites/units/chaos-array-base.png

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

0

core/assets-raw/sprites/mechs/mechs/chaos-array-leg.png → core/assets-raw/sprites/units/chaos-array-leg.png

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

0

core/assets-raw/sprites/mechs/mechs/chaos-array.png → core/assets-raw/sprites/units/chaos-array.png

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

0

core/assets-raw/sprites/mechs/mechs/eradicator-base.png → core/assets-raw/sprites/units/eradicator-base.png

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

0

core/assets-raw/sprites/mechs/mechs/eradicator-leg.png → core/assets-raw/sprites/units/eradicator-leg.png

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

0

core/assets-raw/sprites/mechs/mechs/eradicator.png → core/assets-raw/sprites/units/eradicator.png

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

BIN

core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor-end.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 156 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 280 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 251 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 269 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 223 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 350 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 228 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 368 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 218 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 320 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 186 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 319 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 373 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 362 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 199 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 378 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 348 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 335 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 321 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 165 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 306 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 283 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 241 B After Width:  |  Height:  |  Size: 1.8 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 389 B After Width:  |  Height:  |  Size: 1.8 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 249 B After Width:  |  Height:  |  Size: 1.9 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 404 B After Width:  |  Height:  |  Size: 1.9 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 226 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 333 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 195 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 342 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 374 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 198 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 379 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 355 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 187 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 335 B After Width:  |  Height:  |  Size: 1.5 KiB

BIN

core/assets-raw/sprites_replacement/blocks/environment/white-tree-dead.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/blocks/environment/white-tree.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/blocks/extra/block-border.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/effects/laser-end.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/effects/laser.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/effects/minelaser-end.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/effects/minelaser.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/items/item-biomatter.png

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/items/item-metaglass.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.4 KiB

BIN

core/assets-raw/sprites_replacement/items/item-silicon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.9 KiB

BIN

core/assets-raw/sprites_replacement/items/item-spore-pod.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites_replacement/items/item-surge-alloy.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

BIN

core/assets-raw/sprites_replacement/items/item-thorium.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

BIN

core/assets-raw/sprites_replacement/items/item-titanium.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

core/assets-raw/sprites_replacement/items/liquid-cryofluid.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

BIN

core/assets-raw/sprites_replacement/items/liquid-oil.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 2.7 KiB

BIN

core/assets-raw/sprites_replacement/items/liquid-slag.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

BIN

core/assets-raw/sprites_replacement/items/liquid-water.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 3.0 KiB

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