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/world/blocks/defense/turrets/Turret.java
This commit is contained in:
Anuken
2022-01-17 15:44:09 -05:00
parent ae8c219130 cc221d669a
commit d1206d2e2f
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/contributors
View File

@@ -132,3 +132,4 @@ Darkness6030
hortiSquash
King-BR
citrusMarmelade
Evolveye