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 4.0

Browse Source 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Platform.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
#	desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
This commit is contained in:
Anuken
2018-05-31 17:00:47 -04:00
parent 32201dda72 fcb74d4fba
commit a141df434c
13 changed files with 85 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/robovm.properties
+1 -1
View File
@@ -2,5 +2,5 @@ app.version=3.5
app.id=io.anuke.mindustry
app.mainclass=io.anuke.mindustry.IOSLauncher
app.executable=IOSLauncher
app.build=10
app.build=11
app.name=Mindustry