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/icons/icons.properties
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	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
	core/src/mindustry/content/Blocks.java
This commit is contained in:
slava0135
2020-09-30 09:48:18 +03:00
parent fb53abe593 3c3c15dcf4
commit d4402ee3bb
33 changed files with 13791 additions and 13571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/icons/icons.properties
+1
View File
@@ -312,3 +312,4 @@
63424=corvus|unit-corvus-medium
63423=memory-bank|block-memory-bank-medium
63422=tsunami|block-tsunami-medium
63422=foreshadow|block-foreshadow-medium