Merge branch 'master' into master · 24071ed23b - Mindustry - Gitea: Git with a cup of tea

Astronand/Mindustry

Merge branch 'master' into master

This commit is contained in:

Prosta4okua

2020-06-28 19:41:37 +03:00

committed by

GitHub

parent e1e9b28bf1 6386cae19a

commit 24071ed23b

1106 changed files with 64411 additions and 37311 deletions

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 3.3 KiB

core/assets-raw/sprites/blocks/campaign/data-processor-2.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 836 B

core/assets-raw/sprites/blocks/campaign/data-processor-top.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.4 KiB

core/assets-raw/sprites/blocks/campaign/data-processor.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.2 KiB

core/assets-raw/sprites/blocks/storage/launch-pad-large.png → core/assets-raw/sprites/blocks/campaign/launch-pad-large.png

View File

Before

Width: | Height: | Size: 1.2 KiB

After

Width: | Height: | Size: 1.2 KiB

core/assets-raw/sprites/blocks/campaign/launch-pad-light.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 186 B

core/assets-raw/sprites/blocks/campaign/launch-pad.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.3 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.1 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 516 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.3 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 794 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.3 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 895 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 178 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.6 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.6 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.1 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.4 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.1 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 170 B

core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 503 B

core/assets-raw/sprites/blocks/distribution/mass-conveyor-icon.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 926 B

core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 513 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 412 B

core/assets-raw/sprites/blocks/distribution/payload-router-edge.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 129 B

core/assets-raw/sprites/blocks/distribution/payload-router-icon.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1000 B

core/assets-raw/sprites/blocks/distribution/payload-router-over.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 720 B

core/assets-raw/sprites/blocks/distribution/payload-router-top.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 513 B

core/assets-raw/sprites/blocks/distribution/payload-router.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 307 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 258 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 239 B

After

Width: | Height: | Size: 291 B

									
										core/assets-raw/sprites/blocks/environment/pack.json
									
		+2
		-2
	
												View File
												
				@@ -2,7 +2,7 @@

				  duplicatePadding: true,

				  combineSubdirectories: true,

				  flattenPaths: true,

				  maxWidth: 2048,

				  maxHeight: 2048,

				  maxWidth: 4096,

				  maxHeight: 4096,

				  fast: true

				}

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 177 B

After

Width: | Height: | Size: 237 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.3 KiB

core/assets-raw/sprites/blocks/environment/tainted-water.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 239 B

After

Width: | Height: | Size: 290 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 240 B

After

Width: | Height: | Size: 291 B

core/assets-raw/sprites/blocks/extra/rubble-3-1.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 520 B

core/assets-raw/sprites/blocks/extra/rubble-4-1.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 870 B

core/assets-raw/sprites/blocks/extra/rubble-5-1.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 991 B

core/assets-raw/sprites/blocks/extra/rubble-6-1.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 1.9 KiB

core/assets-raw/sprites/blocks/extra/rubble-7-1.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 2.2 KiB

core/assets-raw/sprites/blocks/extra/rubble-8-1.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 2.5 KiB

core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 174 B

core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 98 B

core/assets-raw/sprites/blocks/liquid/conduit-top-5.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 283 B

core/assets-raw/sprites/blocks/liquid/conduit-top-6.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 302 B

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

View File

Before

Width: | Height: | Size: 274 B

After

Width: | Height: | Size: 274 B

core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 172 B

After

Width: | Height: | Size: 178 B

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 362 B

After

Width: | Height: | Size: 396 B

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 400 B

After

Width: | Height: | Size: 499 B

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 400 B

After

Width: | Height: | Size: 420 B

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 453 B

After

Width: | Height: | Size: 415 B

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 409 B

After

Width: | Height: | Size: 434 B

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 381 B

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 405 B

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 327 B

core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 339 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 274 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 274 B

core/assets-raw/sprites/blocks/mechs/dart-mech-pad.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 579 B

core/assets-raw/sprites/blocks/mechs/delta-mech-pad.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 564 B

core/assets-raw/sprites/blocks/mechs/glaive-ship-pad.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 1007 B

core/assets-raw/sprites/blocks/mechs/javelin-ship-pad.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 578 B

core/assets-raw/sprites/blocks/mechs/omega-mech-pad.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 965 B

core/assets-raw/sprites/blocks/mechs/tau-mech-pad.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 566 B

core/assets-raw/sprites/blocks/mechs/trident-ship-pad.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 581 B

core/assets-raw/sprites/blocks/power/solar-panel-large.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 965 B

After

Width: | Height: | Size: 1.5 KiB

core/assets-raw/sprites/blocks/power/solar-panel.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 226 B

After

Width: | Height: | Size: 347 B

core/assets-raw/sprites/blocks/power/thorium-reactor-center.png → core/assets-raw/sprites/blocks/power/thorium-reactor-top.png

View File

Before

Width: | Height: | Size: 779 B

After

Width: | Height: | Size: 779 B

core/assets-raw/sprites/blocks/power/turbine-generator-cap.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 558 B

core/assets-raw/sprites/blocks/power/turbine-generator-turbine0.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 260 B

core/assets-raw/sprites/blocks/power/turbine-generator-turbine1.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 206 B

core/assets-raw/sprites/blocks/power/turbine-generator.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 782 B

After

Width: | Height: | Size: 1.1 KiB

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.3 KiB

core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 713 B

After

Width: | Height: | Size: 1.3 KiB

core/assets-raw/sprites/blocks/production/disassembler-liquid.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 430 B

core/assets-raw/sprites/blocks/production/disassembler-spinner.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 299 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.2 KiB

core/assets-raw/sprites/blocks/production/graphite-press.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 701 B

After

Width: | Height: | Size: 1.0 KiB

core/assets-raw/sprites/blocks/production/item-void.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 209 B

After

Width: | Height: | Size: 356 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 678 B

After

Width: | Height: | Size: 1.1 KiB

core/assets-raw/sprites/blocks/production/liquid-void.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 211 B

After

Width: | Height: | Size: 366 B

core/assets-raw/sprites/blocks/production/multi-press.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 994 B

After

Width: | Height: | Size: 991 B

core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 157 B

After

Width: | Height: | Size: 223 B

core/assets-raw/sprites/blocks/production/phase-weaver-weave.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 191 B

After

Width: | Height: | Size: 283 B

core/assets-raw/sprites/blocks/production/silicon-crucible-top.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 418 B

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

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.8 KiB

core/assets-raw/sprites/blocks/production/silicon-smelter.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 640 B

After

Width: | Height: | Size: 1.1 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 256 B

After

Width: | Height: | Size: 400 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 259 B

After

Width: | Height: | Size: 413 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 234 B

After

Width: | Height: | Size: 376 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 777 B

After

Width: | Height: | Size: 1.2 KiB

core/assets-raw/sprites/blocks/environment/rock1.png → core/assets-raw/sprites/blocks/props/rock1.png

View File

Before

Width: | Height: | Size: 414 B

After

Width: | Height: | Size: 414 B

core/assets-raw/sprites/blocks/environment/rock2.png → core/assets-raw/sprites/blocks/props/rock2.png

View File

Before

Width: | Height: | Size: 402 B

After

Width: | Height: | Size: 402 B

core/assets-raw/sprites/blocks/environment/sand-boulder1.png → core/assets-raw/sprites/blocks/props/sand-boulder1.png

View File

Before

Width: | Height: | Size: 292 B

After

Width: | Height: | Size: 292 B

core/assets-raw/sprites/blocks/environment/sand-boulder2.png → core/assets-raw/sprites/blocks/props/sand-boulder2.png

View File

Before

Width: | Height: | Size: 313 B

After

Width: | Height: | Size: 313 B

core/assets-raw/sprites/blocks/environment/shale-boulder1.png → core/assets-raw/sprites/blocks/props/shale-boulder1.png

View File

Before

Width: | Height: | Size: 271 B

After

Width: | Height: | Size: 271 B

core/assets-raw/sprites/blocks/environment/shale-boulder2.png → core/assets-raw/sprites/blocks/props/shale-boulder2.png

View File

Before

Width: | Height: | Size: 297 B

After

Width: | Height: | Size: 297 B

core/assets-raw/sprites/blocks/environment/snowrock1.png → core/assets-raw/sprites/blocks/props/snowrock1.png

View File

Before

Width: | Height: | Size: 411 B

After

Width: | Height: | Size: 411 B

core/assets-raw/sprites/blocks/environment/snowrock2.png → core/assets-raw/sprites/blocks/props/snowrock2.png

View File

Before

Width: | Height: | Size: 410 B

After

Width: | Height: | Size: 410 B