Merge branch 'view_assets' into dev_client

# Conflicts:
#	Projekte/mdga/client/build.gradle

Projekte/.gitignore

@@ -1,43 +0,0 @@
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### IntelliJ IDEA ###
-.idea
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

Projekte/mdga/client/build.gradle

@@ -18,5 +18,5 @@ implementation project(":mdga:model")
 
 application {
     mainClass = 'pp.mdga.client.MdgaApp'
-    applicationName = 'mdga'
+    applicationName = 'MDGA'
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java

@@ -0,0 +1,15 @@
+package pp.mdga.client;
+
+import com.jme3.app.SimpleApplication;
+
+public class MdgaApp extends SimpleApplication {
+    public static void main(String[] args) {
+        MdgaApp app = new MdgaApp();
+        app.start();
+    }
+
+    @Override
+    public void simpleInitApp() {
+
+    }
+}

Projekte/settings.gradle

@@ -32,3 +32,8 @@
         }
     }
 }
+include 'mdga:client'
+findProject(':mdga:client')?.name = 'client'
+include 'mdga:client'
+findProject(':mdga:client')?.name = 'client'
+