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 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/content/Blocks.java
This commit is contained in:
Anuken
2021-06-09 17:10:49 -04:00
parent 974ebe6937 a587477fc0
commit 8c32c00e2b
93 changed files with 1617 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,3 +378,4 @@
63355=silicon-arc-smelter|block-silicon-arc-smelter-ui
63354=payload-launch-pad|block-payload-launch-pad-ui
63353=silicon-arc-furnace|block-silicon-arc-furnace-ui
63352=metal-floor-4|block-metal-floor-4-ui