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

Merge remote-tracking branch 'origin/7.0-features' into 7.0-features

Browse Source 
# Conflicts:
#	core/assets/maps/onset.msav
This commit is contained in:
epowerj
2022-01-23 17:02:39 -05:00
parent 4bdfa894af 8853afc221
commit d66c386881
13 changed files with 106 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/icons/icons.properties
-1
View File
@@ -389,7 +389,6 @@
63319=redweed|block-redweed-ui
63318=pur-bush|block-pur-bush-ui
63317=yellowcoral|block-yellowcoral-ui
63316=coralchunk|block-coralchunk-ui
63315=carbon-boulder|block-carbon-boulder-ui
63314=ferric-boulder|block-ferric-boulder-ui
63313=beryllic-boulder|block-beryllic-boulder-ui