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/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-16 12:39:52 +02:00
parent 424e58ff7d 8a01b87c99
commit 5c28985ee6
610 changed files with 27167 additions and 25697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,5 +218,13 @@
63526=oil|liquid-oil-icon
63525=cryofluid|liquid-cryofluid-icon
63524=underflow-gate|block-underflow-gate-medium
63523=plastanium-conveyor|block-plastanium-conveyor-medium
63522=crater|crater
63523=dart-ship-pad|block-dart-ship-pad-medium
63522=alpha-mech-pad|block-alpha-mech-pad-medium
63521=cliff|block-cliff-medium
63520=legacy-mech-pad|block-legacy-mech-pad-medium
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