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

Merge branch '6.0' into crater

Browse Source 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-16 22:38:51 +02:00
parent 1acc6461e6 280f3dd428
commit 32e32ecae2
19 changed files with 373 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/assets/icons/icons.properties
View File

@@ -225,6 +225,8 @@
63519=ground-factory|block-ground-factory-medium
63518=legacy-unit-factory|block-legacy-unit-factory-medium
63517=mass-conveyor|block-mass-conveyor-medium
63516=crater|crater
63515=plastanium-conveyor|block-plastanium-conveyor-medium
63514=legacy-command-center|block-legacy-command-center-medium
63516=legacy-command-center|block-legacy-command-center-medium
63515=block-forge|block-block-forge-medium
63514=block-launcher|block-block-launcher-medium
63513=plastanium-conveyor|block-plastanium-conveyor-medium
63512=crater|crater