Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami

Browse Source 
 Conflicts:
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites.png
	core/assets/sprites/fallback/sprites2.png
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
This commit is contained in:
slava0135
2020-09-29 18:31:42 +03:00
parent 79f4608e81 521ca1aea4
commit cbc2205347
116 changed files with 25350 additions and 25276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 277 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 229 B

After

Width:  |  Height:  |  Size: 277 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 283 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 278 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 491 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 499 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 522 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 515 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 300 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 252 B

After

Width:  |  Height:  |  Size: 292 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 294 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 299 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 296 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 290 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 234 B

After

Width:  |  Height:  |  Size: 289 B

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 237 B

After

Width:  |  Height:  |  Size: 292 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 375 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 408 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 419 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 409 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 640 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 636 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 410 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 441 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 454 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 448 B

BIN
core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 330 B

After

Width:  |  Height:  |  Size: 376 B

BIN
core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 490 B

BIN
core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 304 B

BIN
core/assets-raw/sprites/blocks/production/phase-weaver.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 763 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
core/assets-raw/sprites/blocks/turrets/lancer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 812 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
core/assets-raw/sprites/blocks/turrets/wave-top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

BIN
core/assets-raw/sprites/blocks/walls/copper-wall-large.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 660 B

BIN
core/assets-raw/sprites/blocks/walls/surge-wall-large.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 843 B

BIN
core/assets-raw/sprites/blocks/walls/surge-wall.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 323 B

BIN
core/assets-raw/sprites/blocks/walls/thorium-wall-large.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 602 B

After

Width:  |  Height:  |  Size: 796 B

BIN
core/assets-raw/sprites/blocks/walls/thorium-wall.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 323 B

BIN
core/assets-raw/sprites/blocks/walls/titanium-wall-large.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 428 B

After

Width:  |  Height:  |  Size: 655 B