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/type/UnitType.java
This commit is contained in:
Anuken
2021-10-01 09:41:33 -04:00
parent 5f3cef251b b265ddac03
commit 10b8a6e4a5
20 changed files with 236 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -122,7 +122,7 @@ committingchanges = Committing Changes
done = Done
feature.unsupported = Your device does not support this feature.
mods.initfailed = [red]⚠[] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]\n\nTo disable this feature, turn it off in [accent]Settings->Game->Disable Mods On Startup Crash[].
mods.initfailed = [red]⚠[] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]
mods = Mods
mods.none = [lightgray]No mods found!
mods.guide = Modding Guide