Merging changes from private branch

desktop/build.gradle

@@ -45,6 +45,7 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
     from files(sourceSets.main.output.resourcesDir)
     from {configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) }}
     from files(project.assetsDir)
+    exclude("config/**")
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
     //don't include steam shared libraries unless necessary

desktop/src/mindustry/desktop/DesktopLauncher.java

@@ -53,6 +53,7 @@ public class DesktopLauncher extends ClientLauncher{
                                 case "height": height = Integer.parseInt(arg[i + 1]); break;
                                 case "gl3": gl30 = true; break;
                                 case "gl2": gl30 = false; break;
+                                case "coreGl": coreProfile = true; break;
                                 case "antialias": samples = 16; break;
                                 case "debug": Log.level = LogLevel.debug; break;
                                 case "maximized": maximized = Boolean.parseBoolean(arg[i + 1]); break;