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/Planets.java
	tools/src/mindustry/tools/Generators.java
This commit is contained in:
Anuken
2021-10-20 10:45:51 -04:00
parent 733e0e86f9 a21f6d335f
commit d3343c0ae9
78 changed files with 585 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+1
View File
@@ -415,6 +415,7 @@ wavemode.health = health
editor.default = [lightgray]<Default>
details = Details...
edit = Edit...
variables = Vars
editor.name = Name:
editor.spawn = Spawn Unit
editor.removeunit = Remove Unit