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/core/ContentLoader.java
	core/src/mindustry/world/Block.java
This commit is contained in:
Anuken
2022-01-27 14:58:44 -05:00
parent 7cdd9edb5f 0b9483cffc
commit e4595b6831
16 changed files with 152 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/contributors
View File

@@ -116,7 +116,7 @@ younggam
simba-fs
RedRadiation
Marko Zajc
CPX MC
PCX-LK (CPX MC)
Phinner
BTA_Susideur
nilq