diff --git a/Plugin Cubot/Plugin Cubot.iml b/Plugin Cubot/Plugin Cubot.iml
index 811f55d..c10f299 100644
--- a/Plugin Cubot/Plugin Cubot.iml
+++ b/Plugin Cubot/Plugin Cubot.iml
@@ -28,27 +28,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Plugin Misc HW/Plugin Misc HW.iml b/Plugin Misc HW/Plugin Misc HW.iml
index dda82b5..2817a50 100644
--- a/Plugin Misc HW/Plugin Misc HW.iml
+++ b/Plugin Misc HW/Plugin Misc HW.iml
@@ -27,27 +27,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Plugin NPC/Plugin NPC.iml b/Plugin NPC/Plugin NPC.iml
index 7cddba0..2238d89 100644
--- a/Plugin NPC/Plugin NPC.iml
+++ b/Plugin NPC/Plugin NPC.iml
@@ -30,26 +30,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Plugin Plant/Plugin Plant.iml b/Plugin Plant/Plugin Plant.iml
index 7cddba0..2238d89 100644
--- a/Plugin Plant/Plugin Plant.iml
+++ b/Plugin Plant/Plugin Plant.iml
@@ -30,26 +30,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Server/Server.iml b/Server/Server.iml
index 39ed77c..b1a9e2c 100644
--- a/Server/Server.iml
+++ b/Server/Server.iml
@@ -29,26 +29,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Server/pom.xml b/Server/pom.xml
index 2145284..60012c3 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -114,6 +114,11 @@
spring-security-core
5.0.4.RELEASE
+
+ com.sparkjava
+ spark-core
+ 2.7.2
+
com.sparkjava
spark-template-velocity
diff --git a/Server/src/main/java/net/simon987/server/web/WebServer.java b/Server/src/main/java/net/simon987/server/web/WebServer.java
index febd789..8f20e55 100644
--- a/Server/src/main/java/net/simon987/server/web/WebServer.java
+++ b/Server/src/main/java/net/simon987/server/web/WebServer.java
@@ -26,7 +26,7 @@ public class WebServer {
/*
* Generate keystore from Let's Encrypt with command:
- * openssl pkcs12 -export -in fullchain.pem -inkey privkey.pem -out keystore.kjs -name muchassemblyrequired -CAfile chain.pem -caname root -password file:password.txt
+ * openssl pkcs12 -export -in fullchain.pem -inkey privkey.pem -out keystore.jks -name muchassemblyrequired -CAfile chain.pem -caname root -password file:password.txt
*
* Certificates generated from Let's Encrypt are usually in /etc/letsencrypt/live/www.site.com
*/
diff --git a/Server/src/main/resources/static/css/mar.css b/Server/src/main/resources/static/css/mar.css
index 733c54b..1940cc5 100644
--- a/Server/src/main/resources/static/css/mar.css
+++ b/Server/src/main/resources/static/css/mar.css
@@ -118,7 +118,7 @@
width: 100%;
position: fixed;
bottom: 0;
- z-index: 4;
+ z-index: 8;
box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.2);
}
@@ -138,7 +138,7 @@
background: #2d2d2d;
height: 100%;
pointer-events: auto;
- box-shadow: rgb(0, 0, 0, 0.2) 3px 0 8px;
+ box-shadow: rgba(0, 0, 0, 0.2) 3px 0 8px;
}
.bottom-panel {
@@ -147,7 +147,7 @@
width: 100%;
position: fixed;
bottom: 0;
- z-index: 4;
+ z-index: 8;
box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.2);
}