From 2913534db45480d9e142cc4294966368114651b8 Mon Sep 17 00:00:00 2001
From: ViViV_ <sysadmin@whiteshield.ch>
Date: Mon, 24 Feb 2020 19:55:19 +0100
Subject: [PATCH 01/48] Add Stationeers Eggs

---
 README.md                                     |  1 +
 steamcmd_servers/README.md                    |  3 +
 steamcmd_servers/Stationners/README.md        | 15 ++++
 .../Stationners/egg-stationeers .json         | 90 +++++++++++++++++++
 4 files changed, 109 insertions(+)
 create mode 100644 steamcmd_servers/Stationners/README.md
 create mode 100644 steamcmd_servers/Stationners/egg-stationeers .json

diff --git a/README.md b/README.md
index c768cf0e..9837273e 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Rust Staging Branch](/steamcmd_servers/rust_staging/)
 * [SCP: Secret Laboratory](/steamcmd_servers/scpsl/)
 * [Starbound](/steamcmd_servers/starbound)
+* [Stationeers](/steamcmd_servers/Stationeers/)
 * [Sven Co-op](/steamcmd_servers/svencoop)
 * [Squad](/steamcmd_servers/squad/)
 * [Unturned](/steamcmd_servers/unturned/)
diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md
index 5cef5d34..0cf9f22f 100644
--- a/steamcmd_servers/README.md
+++ b/steamcmd_servers/README.md
@@ -43,6 +43,9 @@ This is a collection of servers that use steamcmd to install.
 ## Starbound
 [starbound](starbound/)
 
+## Stationeers
+[Stationeers](/steamcmd_servers/Stationeers/)
+
 ## Sven coop
 [svencoop](svencoop)
 
diff --git a/steamcmd_servers/Stationners/README.md b/steamcmd_servers/Stationners/README.md
new file mode 100644
index 00000000..63aefa53
--- /dev/null
+++ b/steamcmd_servers/Stationners/README.md
@@ -0,0 +1,15 @@
+# Stationeers
+Steam Description  
+Construct and manage your own space station either by yourself in singleplayer or with friends online! Fully functioning atmospherics, science, power, engineering, medical, logic, and agricultural systems. Explore to find asteroids and construct elaborate factories to harvest your resources!
+
+### Server Ports
+Stationeers requires up to 2 ports
+
+game port (default 27500)
+Steam Query Ports (default 27015)
+
+
+| Port    | default       |
+|---------|---------------|
+| Game    |     27500      |
+| Query     |     27015     |
\ No newline at end of file
diff --git a/steamcmd_servers/Stationners/egg-stationeers .json b/steamcmd_servers/Stationners/egg-stationeers .json
new file mode 100644
index 00000000..a7382b09
--- /dev/null
+++ b/steamcmd_servers/Stationners/egg-stationeers .json	
@@ -0,0 +1,90 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-02-24T18:48:49+01:00",
+    "name": "Stationeers",
+    "author": "sysadmin@whiteshield.ch",
+    "description": "Stationeers Server\r\n\r\ndefault.ini will be created once you start game. Command parameters override default.ini parameters\r\nDon't forget to change the RCON Password !!\r\n\r\nRemote Administrator:\r\nYou can send commands on web browser.\r\nLink : http:\/\/[dedicated server address]:[GamePort]\r\n\r\nDedicated Server Wiki ==> https:\/\/stationeers-wiki.com\/Dedicated_Server_Guide\r\n\r\nStopping the server don't save the game, for manual save use the Remote Administrator.",
+    "image": "quay.io\/pterodactyl\/core:source",
+    "startup": ".\/rocketstation_DedicatedServer.x86_64 -batchmode -nographics -autostart -autosaveinterval={{SAVE_INTERVAL}} -clearallinterval={{CLEAR_INTERVAL}} -worldtype={{SERVER_MAP}} -worldname={{SAVE_NAME}} -loadworld={{SAVE_NAME}} -basedirectory=\/home\/container -updateport={{UPDATE_PORT}} -gameport={{GAME_PORT}} -servername=\"{{HOSTNAME}}\"",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Dedicated Server Started\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# Stationeers: Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 600760 -beta public +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so",
+            "container": "ubuntu:16.04",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Server Map",
+            "description": "Available Maps: Moon, Mars, Europa, Vulkcain, Space, Mimas, Loulan",
+            "env_variable": "SERVER_MAP",
+            "default_value": "Moon",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Save Interval",
+            "description": "Sets the server\u2019s auto-save interval in seconds.",
+            "env_variable": "SAVE_INTERVAL",
+            "default_value": "300",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|integer"
+        },
+        {
+            "name": "Auto Clear Disconnected Player",
+            "description": "Clear disconnected player interval in seconds",
+            "env_variable": "CLEAR_INTERVAL",
+            "default_value": "900",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|integer"
+        },
+        {
+            "name": "Save Name",
+            "description": "Name of the save of your world.\r\nAuto save & auto load worlds on server startup.",
+            "env_variable": "SAVE_NAME",
+            "default_value": "stationeers_1",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Gameport",
+            "description": "UDP port for game. Avoid to set 27015-27020. It's steam's local server query ports.",
+            "env_variable": "GAME_PORT",
+            "default_value": "27500",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|integer"
+        },
+        {
+            "name": "Update Port",
+            "description": "UDP port for steam query must be between 27015-27020.",
+            "env_variable": "UPDATE_PORT",
+            "default_value": "27015",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|integer"
+        },
+        {
+            "name": "Server Name",
+            "description": "The name of your server in the public server list.",
+            "env_variable": "HOSTNAME",
+            "default_value": "Stationeers Pterodactyl Server",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:30"
+        }
+    ]
+}
\ No newline at end of file

From d894628f510cdc498b4e2828e730b3e6e22c86fc Mon Sep 17 00:00:00 2001
From: ViViV_ <sysadmin@whiteshield.ch>
Date: Mon, 2 Mar 2020 12:32:50 +0100
Subject: [PATCH 02/48] Update egg-stationeers .json

-Remove server name variable
-Change clear time default to 86400
---
 .../Stationners/egg-stationeers .json             | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/steamcmd_servers/Stationners/egg-stationeers .json b/steamcmd_servers/Stationners/egg-stationeers .json
index a7382b09..c5a094d7 100644
--- a/steamcmd_servers/Stationners/egg-stationeers .json	
+++ b/steamcmd_servers/Stationners/egg-stationeers .json	
@@ -8,7 +8,7 @@
     "author": "sysadmin@whiteshield.ch",
     "description": "Stationeers Server\r\n\r\ndefault.ini will be created once you start game. Command parameters override default.ini parameters\r\nDon't forget to change the RCON Password !!\r\n\r\nRemote Administrator:\r\nYou can send commands on web browser.\r\nLink : http:\/\/[dedicated server address]:[GamePort]\r\n\r\nDedicated Server Wiki ==> https:\/\/stationeers-wiki.com\/Dedicated_Server_Guide\r\n\r\nStopping the server don't save the game, for manual save use the Remote Administrator.",
     "image": "quay.io\/pterodactyl\/core:source",
-    "startup": ".\/rocketstation_DedicatedServer.x86_64 -batchmode -nographics -autostart -autosaveinterval={{SAVE_INTERVAL}} -clearallinterval={{CLEAR_INTERVAL}} -worldtype={{SERVER_MAP}} -worldname={{SAVE_NAME}} -loadworld={{SAVE_NAME}} -basedirectory=\/home\/container -updateport={{UPDATE_PORT}} -gameport={{GAME_PORT}} -servername=\"{{HOSTNAME}}\"",
+    "startup": ".\/rocketstation_DedicatedServer.x86_64 -batchmode -nographics -autostart -autosaveinterval={{SAVE_INTERVAL}} -clearallinterval={{CLEAR_INTERVAL}} -worldtype={{SERVER_MAP}} -worldname={{SAVE_NAME}} -loadworld={{SAVE_NAME}} -basedirectory=\/home\/container -updateport={{UPDATE_PORT}} -gameport={{GAME_PORT}}",
     "config": {
         "files": "{}",
         "startup": "{\r\n    \"done\": \"Dedicated Server Started\",\r\n    \"userInteraction\": []\r\n}",
@@ -25,7 +25,7 @@
     "variables": [
         {
             "name": "Server Map",
-            "description": "Available Maps: Moon, Mars, Europa, Vulkcain, Space, Mimas, Loulan",
+            "description": "Available Maps: Moon, Mars, Europa, Vulcan, Space, Mimas, Loulan",
             "env_variable": "SERVER_MAP",
             "default_value": "Moon",
             "user_viewable": 1,
@@ -45,7 +45,7 @@
             "name": "Auto Clear Disconnected Player",
             "description": "Clear disconnected player interval in seconds",
             "env_variable": "CLEAR_INTERVAL",
-            "default_value": "900",
+            "default_value": "86400",
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "required|integer"
@@ -76,15 +76,6 @@
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "required|integer"
-        },
-        {
-            "name": "Server Name",
-            "description": "The name of your server in the public server list.",
-            "env_variable": "HOSTNAME",
-            "default_value": "Stationeers Pterodactyl Server",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|string|max:30"
         }
     ]
 }
\ No newline at end of file

From aa16af40fcfb519ec46f4e0bab4923cb9cd15b36 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Mon, 2 Mar 2020 18:48:48 -0500
Subject: [PATCH 03/48] add postgres

This adds a postgres egg.

Needs heavy testing.

resolves #447
---
 database/postgres/egg-postgres.json | 63 +++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 database/postgres/egg-postgres.json

diff --git a/database/postgres/egg-postgres.json b/database/postgres/egg-postgres.json
new file mode 100644
index 00000000..bf68fbe4
--- /dev/null
+++ b/database/postgres/egg-postgres.json
@@ -0,0 +1,63 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-03-02T18:46:11-05:00",
+    "name": "Postgres",
+    "author": "parker@parkervcp.com",
+    "description": "A default Postgres install that is not really editable.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:db_postgres",
+    "startup": "postgres  -D \/home\/container\/postgres_db\/",
+    "config": {
+        "files": "{\r\n    \"postgres_db\/postgresql.conf\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n\t\t    \"#port =\": \"port = {{server.build.default.port}}\",\r\n            \"#external_pid_file =\": \"external_pid_file = '\/home\/container\/postgres_db\/run\/postgres.pid'\",\r\n            \"#unix_socket_directories =\": \"unix_socket_directories = '\/home\/container\/postgres_db\/run\/'\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"database system is ready to accept connections\"\r\n}",
+        "logs": "{}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#! \/bin\/ash\r\nadduser -D -h \/home\/container container\r\n\r\necho $POSTGRES_PASSWORD > .passwd\r\n\r\nchown -R container: \/mnt\/server\/\r\n\r\ncat .passwd\r\n\r\nsu container -c 'initdb -D \/mnt\/server\/postgres_db\/ -A md5 -U container --pwfile .passwd'\r\n\r\nmkdir -p \/mnt\/server\/postgres_db\/run\/\r\n\r\necho -e \"Done\"",
+            "container": "postgres:11-alpine",
+            "entrypoint": "ash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Database Password",
+            "description": "The Postgres user password that can be changed and should change on server restart.",
+            "env_variable": "PGPASSWORD",
+            "default_value": "P@55word",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "SuperUser Password",
+            "description": "The postgres super user password with a strong default.\r\nYou should be generating new ones for each server.\r\nIf you don't then users can hit other users DB's",
+            "env_variable": "PGROOT",
+            "default_value": "ZPWgpMN4hETqjXAV",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Postgres User",
+            "description": "The user for the postgres database",
+            "env_variable": "PGUSER",
+            "default_value": "pterodactyl",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Postgres Database",
+            "description": "The postgres databas the user will have access too.",
+            "env_variable": "PGDATABASE",
+            "default_value": "pterodactyl",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
\ No newline at end of file

From 5d71f035f999d633f2f07634794bdb671ad4cbf5 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Mon, 2 Mar 2020 18:55:41 -0500
Subject: [PATCH 04/48] update readme files

adds postgres readme
---
 README.md                   |  1 +
 database/postgres/README.md | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 database/postgres/README.md

diff --git a/README.md b/README.md
index d5d9d4b7..e22f5f51 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 
 ## Database Eggs
 [MariaDB](/database/mariadb/)
+[PostgreSQL](/database/postgres/)
 
 ## Game Eggs
 
diff --git a/database/postgres/README.md b/database/postgres/README.md
new file mode 100644
index 00000000..68feb186
--- /dev/null
+++ b/database/postgres/README.md
@@ -0,0 +1,16 @@
+# PostgreSQL
+### From their [Website](https://www.postgresql.org/)
+The World's Most Advanced Open Source Relational Database 
+
+### Minimum RAM warning
+2 Gigabytes minimum recommended
+
+See here https://www.commandprompt.com/blog/postgresql_mininum_requirements/
+
+
+### Server Ports
+Ports required to run the server in a table format.
+
+| Port    | default |
+|---------|---------|
+| Server  |  5432   |

From c8f2b3a73ceca93db98d3d9372b77722f0c64fc7 Mon Sep 17 00:00:00 2001
From: "Michael (Parker) Parker" <parkervcp@gmail.com>
Date: Wed, 4 Mar 2020 09:54:41 -0500
Subject: [PATCH 05/48] update installer version to postgres 12.2

---
 database/postgres/egg-postgres.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/database/postgres/egg-postgres.json b/database/postgres/egg-postgres.json
index bf68fbe4..59368cf9 100644
--- a/database/postgres/egg-postgres.json
+++ b/database/postgres/egg-postgres.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-03-02T18:46:11-05:00",
+    "exported_at": "2020-03-04T09:53:34-05:00",
     "name": "Postgres",
     "author": "parker@parkervcp.com",
     "description": "A default Postgres install that is not really editable.",
@@ -18,7 +18,7 @@
     "scripts": {
         "installation": {
             "script": "#! \/bin\/ash\r\nadduser -D -h \/home\/container container\r\n\r\necho $POSTGRES_PASSWORD > .passwd\r\n\r\nchown -R container: \/mnt\/server\/\r\n\r\ncat .passwd\r\n\r\nsu container -c 'initdb -D \/mnt\/server\/postgres_db\/ -A md5 -U container --pwfile .passwd'\r\n\r\nmkdir -p \/mnt\/server\/postgres_db\/run\/\r\n\r\necho -e \"Done\"",
-            "container": "postgres:11-alpine",
+            "container": "postgres:12.2-alpine",
             "entrypoint": "ash"
         }
     },

From 00f3a4f080f9d5e4aacb16b09fbc2b53f211398e Mon Sep 17 00:00:00 2001
From: "Michael (Parker) Parker" <parkervcp@gmail.com>
Date: Wed, 4 Mar 2020 13:24:17 -0500
Subject: [PATCH 06/48] add redis egg

---
 README.md                     |  2 +-
 database/README.md            |  9 ++++++---
 database/redis/README.md      | 16 ++++++++++++++++
 database/redis/egg-redis.json | 36 +++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 database/redis/README.md
 create mode 100644 database/redis/egg-redis.json

diff --git a/README.md b/README.md
index f72a5a75..5387aae8 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 
 ## Database Eggs
 [MariaDB](/database/mariadb/)
-
+[Redis](/database/redis/)
 ## Game Eggs
 
 [ET Legacy](/enemy_territory/etlegacy/)
diff --git a/database/README.md b/database/README.md
index 66e60c2b..c040f047 100644
--- a/database/README.md
+++ b/database/README.md
@@ -2,8 +2,11 @@
 
 ## sql DBs
 
-### [mariadb](/database/mariadb/)
+### [mariadb](/mariadb/)
     https://mariadb.org/
 
-### [postgres](/database/postgres/)
-    https://www.postgresql.org/
\ No newline at end of file
+### [postgres](/postgres/)
+    https://www.postgresql.org/
+
+### [redis](/redis/)
+    https://redis.io/
\ No newline at end of file
diff --git a/database/redis/README.md b/database/redis/README.md
new file mode 100644
index 00000000..4c89fc87
--- /dev/null
+++ b/database/redis/README.md
@@ -0,0 +1,16 @@
+# Redis
+### From their [Website](https://redis.io/)
+Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.
+
+### Minimum RAM warning
+It's recommended to have 4gb of RAM for redis
+
+See here https://docs.redislabs.com/latest/rs/administering/designing-production/hardware-requirements/
+
+
+### Server Ports
+Ports required to run the server in a table format.
+
+| Port    | default |
+|---------|---------|
+| Server  |  6379   |
diff --git a/database/redis/egg-redis.json b/database/redis/egg-redis.json
new file mode 100644
index 00000000..6ac93d66
--- /dev/null
+++ b/database/redis/egg-redis.json
@@ -0,0 +1,36 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-03-04T11:05:29-05:00",
+    "name": "Redis",
+    "author": "parker@parkervcp.com",
+    "description": "Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:db_redis",
+    "startup": "redis-server --bind 0.0.0.0 --port {{SERVER_PORT}} --requirepass {{SERVER_PASSWORD}} --maxmemory {{SERVER_MEMORY}}mb --daemonize yes && redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}} && redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}} shutdown save",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Configuration loaded\"\r\n}",
+        "logs": "{}",
+        "stop": "exit"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/ash\r\n# Redis Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nsleep 5\r\necho -e \"Install complete. Made this to not have issues.\"",
+            "container": "alpine:3.10",
+            "entrypoint": "ash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Redis Password",
+            "description": "The password redis should use to secure the server.",
+            "env_variable": "SERVER_PASSWORD",
+            "default_value": "P@55w0rd",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string"
+        }
+    ]
+}
\ No newline at end of file

From ea75734ba54865373dbd409637bfb3218cb1d514 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sun, 8 Mar 2020 22:55:56 -0400
Subject: [PATCH 07/48] update readme files

---
 README.md                      |  1 +
 minecraft_java/README.md       |  4 ++++
 minecraft_java/magma/README.md | 11 +++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 minecraft_java/magma/README.md

diff --git a/README.md b/README.md
index f72a5a75..bef4cabd 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Cuberite](/minecraft_java/cuberite/)
 * [Forge](/minecraft_java/forge/)
 * [Feed The Beast](/minecraft_java/ftb/)
+* [Magma](/minecraft/magma/)
 * [Paper](/minecraft_java/paper)
 * [Spigot](/minecraft_java/spigot/)
 * [spongeforge](/minecraft_java/spongeforge/)
diff --git a/minecraft_java/README.md b/minecraft_java/README.md
index 68d2b300..a3e9ed34 100644
--- a/minecraft_java/README.md
+++ b/minecraft_java/README.md
@@ -29,6 +29,10 @@ Supply values to 2 variables to use
 [FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation)  
 Revelation is a general all-purpose modpack with optimal FPS, server performance and stability.  
 
+## Magma
+[Magma](https://magmafoundation.org/)
+Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.
+
 ## Paper
 Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar.
 
diff --git a/minecraft_java/magma/README.md b/minecraft_java/magma/README.md
new file mode 100644
index 00000000..51847897
--- /dev/null
+++ b/minecraft_java/magma/README.md
@@ -0,0 +1,11 @@
+# Magma
+
+Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.
+
+## Server Ports
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+
+
+| Port  | default |
+|-------|---------|
+| Game  | 25565   |
\ No newline at end of file

From 2b9fa70addec226a83dcc30d426c285129957c93 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sun, 8 Mar 2020 22:57:01 -0400
Subject: [PATCH 08/48] add egg files

---
 minecraft_java/magma/egg-magma.json | 63 +++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 minecraft_java/magma/egg-magma.json

diff --git a/minecraft_java/magma/egg-magma.json b/minecraft_java/magma/egg-magma.json
new file mode 100644
index 00000000..3d9a39bd
--- /dev/null
+++ b/minecraft_java/magma/egg-magma.json
@@ -0,0 +1,63 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-03-08T22:56:37-04:00",
+    "name": "Magma",
+    "author": "support@pterodactyl.io",
+    "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.",
+    "image": "quay.io\/pterodactyl\/core:java",
+    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
+    "config": {
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
+        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "stop"
+    },
+    "scripts": {
+        "installation": {
+            "script": "## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (match is to match the filename in some way)\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napk add --no-cache curl\r\n\r\n## get latest download link\r\necho -e \"Set to download the ${BUILD} build\"\r\nif [ ${BUILD} == \"dev\" ]; then\r\n    echo -e \"dev tag is ${tag}\"\r\nfi\r\n\r\ncase EXPRES${BUILD}SION in\r\n\r\n  \"recommended\" | \"stable\" | \"latest\")\r\n    DOWNLOAD_URL=$(https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/stable\/latest\/download)\r\n    ;;\r\n\r\n  \"dev\")\r\n    DOWNLOAD_URL=$(https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/dev\/${TAG}\/download)\r\n    ;;\r\n\r\n  *)\r\n    DOWNLOAD_URL=$(https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/stable\/latest\/download)\r\n    ;;\r\nesac\r\n\r\n## validate download link\r\nif [ ! -z \"${DOWNLOAD_URL}\"] ; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ ! ${SERVER_JARFILE} = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\n## mv old server files\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n    mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\r\n\r\necho -e \"Install Complete\"",
+            "container": "alpine:3.10",
+            "entrypoint": "ash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Server Jar File",
+            "description": "The name of the server jarfile to run the server with.",
+            "env_variable": "SERVER_JARFILE",
+            "default_value": "server.jar",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
+        },
+        {
+            "name": "Server Version",
+            "description": "The version of Minecraft Vanilla to install.\r\n\r\nOnly version currently supported is 1.12.2 as that is all there are builds for.",
+            "env_variable": "VANILLA_VERSION",
+            "default_value": "1.12.2",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|between:3,15"
+        },
+        {
+            "name": "Magma Build",
+            "description": "What version of magma to download.\r\n\r\nrecommended, stable, latest = current stable\r\ndev = latest dev build",
+            "env_variable": "BUILD",
+            "default_value": "latest",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Magma Dev Tag",
+            "description": "The dev tagged version to download. default is latest.",
+            "env_variable": "TAG",
+            "default_value": "latest",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
\ No newline at end of file

From c0bd6225795cb441dedb6b4c17457475f860d81f Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Thu, 26 Mar 2020 11:45:31 -0400
Subject: [PATCH 09/48] add teaspeak

Resolves #464
---
 voice_servers/teaspeak/README.md          | 12 ++++
 voice_servers/teaspeak/egg-tea-speak.json | 81 +++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 voice_servers/teaspeak/README.md
 create mode 100644 voice_servers/teaspeak/egg-tea-speak.json

diff --git a/voice_servers/teaspeak/README.md b/voice_servers/teaspeak/README.md
new file mode 100644
index 00000000..b3a8ee56
--- /dev/null
+++ b/voice_servers/teaspeak/README.md
@@ -0,0 +1,12 @@
+# TeaSpeak
+### From their [Website](https://teaspeak.de/)
+Because a license fee is not my cup of tea!  
+
+### Server Ports
+Ports required to run the server in a table format.
+
+| Port    | default |
+|---------|---------|
+| Voice   | 9987    |
+| Query   | 10101   |
+| File    | 30303   |
\ No newline at end of file
diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json
new file mode 100644
index 00000000..4802d232
--- /dev/null
+++ b/voice_servers/teaspeak/egg-tea-speak.json
@@ -0,0 +1,81 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-03-26T11:44:42-04:00",
+    "name": "TeaSpeak",
+    "author": "parker@parkervcp.com",
+    "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "startup": ".\/TeaSpeakServer --property:binding.query.port={{server.build.env.QUERY_PORT}} --property:binding.file.port={{server.build.env.FILE_PORT}} --property:voice.default_port={{server.build.default.port}}",
+    "config": {
+        "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"voice.default_port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.env.QUERY_PORT}}\",\r\n            \"file.port\": \"{{server.build.env.FILE_PORT}}\",\r\n            \"query.motd\": \"\\\"{{server.build.env.SERVER_MOTD}}\\\"\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Started server on \"\r\n}",
+        "logs": "{}",
+        "stop": "shutdown now"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\"]; then\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelse\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Query Port",
+            "description": "The query port for TeaSpeak",
+            "env_variable": "QUERY_PORT",
+            "default_value": "10101",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|numeric|max:65535"
+        },
+        {
+            "name": "File Transfer Port",
+            "description": "The TeaSpeak File Transfer Port",
+            "env_variable": "FILE_PORT",
+            "default_value": "30303",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|numeric|max:65535"
+        },
+        {
+            "name": "Server MOTD",
+            "description": "The TeaSpeak Server MOTD",
+            "env_variable": "SERVER_MOTD",
+            "default_value": "TeaSpeak\\n\\rHosted on pterodactyl!",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:128"
+        },
+        {
+            "name": "ld library path",
+            "description": "Don't touch this if you want the server to start",
+            "env_variable": "LD_LIBRARY_PATH",
+            "default_value": ".\/libs\/",
+            "user_viewable": 0,
+            "user_editable": 0,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "ld preload",
+            "description": "Don't touch this if you want the server to start",
+            "env_variable": "LD_PRELOAD",
+            "default_value": ".\/libs\/libjemalloc.so.2",
+            "user_viewable": 0,
+            "user_editable": 0,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Teaspeak Version",
+            "description": "What version of teaspeak to install",
+            "env_variable": "VERSION",
+            "default_value": "latest",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
\ No newline at end of file

From 3f515b98ecd538a4820d1c905ec146189521630c Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Thu, 26 Mar 2020 12:01:29 -0400
Subject: [PATCH 10/48] fix variable length

---
 voice_servers/teaspeak/egg-tea-speak.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json
index 4802d232..855df219 100644
--- a/voice_servers/teaspeak/egg-tea-speak.json
+++ b/voice_servers/teaspeak/egg-tea-speak.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-03-26T11:44:42-04:00",
+    "exported_at": "2020-03-26T12:00:56-04:00",
     "name": "TeaSpeak",
     "author": "parker@parkervcp.com",
     "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.",
@@ -57,7 +57,7 @@
             "default_value": ".\/libs\/",
             "user_viewable": 0,
             "user_editable": 0,
-            "rules": "required|string|max:20"
+            "rules": "required|string"
         },
         {
             "name": "ld preload",
@@ -66,7 +66,7 @@
             "default_value": ".\/libs\/libjemalloc.so.2",
             "user_viewable": 0,
             "user_editable": 0,
-            "rules": "required|string|max:20"
+            "rules": "required|string"
         },
         {
             "name": "Teaspeak Version",

From a5e96bb2ca94bde9af955ffa329d715250859411 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sat, 28 Mar 2020 13:52:10 -0400
Subject: [PATCH 11/48] update teaspeak egg

Fix install script
Fix startup command
---
 voice_servers/teaspeak/egg-tea-speak.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json
index 855df219..fe395b61 100644
--- a/voice_servers/teaspeak/egg-tea-speak.json
+++ b/voice_servers/teaspeak/egg-tea-speak.json
@@ -3,12 +3,12 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-03-26T12:00:56-04:00",
+    "exported_at": "2020-03-28T13:50:13-04:00",
     "name": "TeaSpeak",
     "author": "parker@parkervcp.com",
     "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
-    "startup": ".\/TeaSpeakServer --property:binding.query.port={{server.build.env.QUERY_PORT}} --property:binding.file.port={{server.build.env.FILE_PORT}} --property:voice.default_port={{server.build.default.port}}",
+    "startup": ".\/TeaSpeakServer --property:binding.query.port={{QUERY_PORT}} --property:binding.file.port={{FILE_PORT}} --property:voice.default_port={{SERVER_PORT}}",
     "config": {
         "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"voice.default_port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.env.QUERY_PORT}}\",\r\n            \"file.port\": \"{{server.build.env.FILE_PORT}}\",\r\n            \"query.motd\": \"\\\"{{server.build.env.SERVER_MOTD}}\\\"\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Started server on \"\r\n}",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\"]; then\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelse\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"",
+            "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelse\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }

From cc2ffd872c09ab53d9289a41b8beea156ccc70c9 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sat, 28 Mar 2020 14:09:51 -0400
Subject: [PATCH 12/48] update readmes

---
 README.md          | 7 +++++--
 database/README.md | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5387aae8..4c392d5b 100644
--- a/README.md
+++ b/README.md
@@ -40,10 +40,13 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/)
 
 ## Database Eggs
+### SQL Databases
 [MariaDB](/database/mariadb/)
-[Redis](/database/redis/)
-## Game Eggs
 
+### In-Memory Databases
+[Redis](/database/redis/)
+
+## Game Eggs
 [ET Legacy](/enemy_territory/etlegacy/)
 
 [Factorio](/factorio/factorio/)
diff --git a/database/README.md b/database/README.md
index c040f047..a8b5ed95 100644
--- a/database/README.md
+++ b/database/README.md
@@ -1,12 +1,13 @@
 # databases
 
-## sql DBs
-
+## SQL Databases
 ### [mariadb](/mariadb/)
     https://mariadb.org/
 
 ### [postgres](/postgres/)
     https://www.postgresql.org/
 
+
+## In-Memory Databases
 ### [redis](/redis/)
     https://redis.io/
\ No newline at end of file

From 41b32d72be4f557a5a01d54b630ff33c52baae0e Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sat, 28 Mar 2020 14:55:04 -0400
Subject: [PATCH 13/48] fix install script.

---
 minecraft_java/magma/egg-magma.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/minecraft_java/magma/egg-magma.json b/minecraft_java/magma/egg-magma.json
index 3d9a39bd..52d31ba4 100644
--- a/minecraft_java/magma/egg-magma.json
+++ b/minecraft_java/magma/egg-magma.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-03-08T22:56:37-04:00",
+    "exported_at": "2020-03-28T14:53:55-04:00",
     "name": "Magma",
     "author": "support@pterodactyl.io",
     "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (match is to match the filename in some way)\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napk add --no-cache curl\r\n\r\n## get latest download link\r\necho -e \"Set to download the ${BUILD} build\"\r\nif [ ${BUILD} == \"dev\" ]; then\r\n    echo -e \"dev tag is ${tag}\"\r\nfi\r\n\r\ncase EXPRES${BUILD}SION in\r\n\r\n  \"recommended\" | \"stable\" | \"latest\")\r\n    DOWNLOAD_URL=$(https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/stable\/latest\/download)\r\n    ;;\r\n\r\n  \"dev\")\r\n    DOWNLOAD_URL=$(https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/dev\/${TAG}\/download)\r\n    ;;\r\n\r\n  *)\r\n    DOWNLOAD_URL=$(https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/stable\/latest\/download)\r\n    ;;\r\nesac\r\n\r\n## validate download link\r\nif [ ! -z \"${DOWNLOAD_URL}\"] ; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ ! ${SERVER_JARFILE} = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\n## mv old server files\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n    mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\r\n\r\necho -e \"Install Complete\"",
+            "script": "## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (match is to match the filename in some way)\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napk add --no-cache curl\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n    mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n## get latest download link\r\necho -e \"Set to download the ${BUILD} build\"\r\nif [ \"${BUILD}\" == \"dev\" ]; then\r\n    echo -e \"dev tag is ${tag}\"\r\nfi\r\n\r\ncase ${BUILD} in\r\n\r\n  \"recommended\" | \"stable\" | \"latest\")\r\n    DOWNLOAD_URL=\"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/stable\/latest\/download\"\r\n    ;;\r\n\r\n  \"dev\")\r\n    DOWNLOAD_URL=\"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/dev\/${TAG}\/download\"\r\n    ;;\r\n\r\n  *)\r\n    DOWNLOAD_URL=\"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${VANILLA_VERSION}\/stable\/latest\/download\"\r\n    ;;\r\nesac\r\n\r\necho -e \"Download URL is ${DOWNLOAD_URL}\"\r\n\r\n## validate download link\r\nif [ ! -z \"${DOWNLOAD_URL}\" ] ; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ ${SERVER_JARFILE} == *\\.jar ]]; then\r\n    echo -e \"adding.jar to server file name\"\r\n    SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\n## mv old server files\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n    echo -e \"moving old server.jar\"\r\n    mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\r\n\r\necho -e \"Install Complete\"",
             "container": "alpine:3.10",
             "entrypoint": "ash"
         }

From 9f32614bbc3fb65c579031daa5b89cd70769b1f0 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Mon, 30 Mar 2020 13:58:10 -0400
Subject: [PATCH 14/48] update don't starve together

Uses new install script
adds srcds_appid variable
---
 .../egg-don-t-starve-together.json            | 54 +++++++++++++++++++
 .../dont_starve/egg-don-t-starve.json         | 45 ----------------
 2 files changed, 54 insertions(+), 45 deletions(-)
 create mode 100644 steamcmd_servers/dont_starve/egg-don-t-starve-together.json
 delete mode 100644 steamcmd_servers/dont_starve/egg-don-t-starve.json

diff --git a/steamcmd_servers/dont_starve/egg-don-t-starve-together.json b/steamcmd_servers/dont_starve/egg-don-t-starve-together.json
new file mode 100644
index 00000000..c294629c
--- /dev/null
+++ b/steamcmd_servers/dont_starve/egg-don-t-starve-together.json
@@ -0,0 +1,54 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-03-30T13:56:41-04:00",
+    "name": "Don't Starve Together",
+    "author": "parker@parkervcp.com",
+    "description": "Don\u2019t Starve Together is an uncompromising wilderness survival game full of science and magic.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:source",
+    "startup": "'cd bin && .\/dontstarve_dedicated_server_nullrenderer -bind_ip 0.0.0.0 -port {{SERVER_PORT}} -console -persistent_storage_root \/home\/container\/DoNotStarveTogether -conf_dir config -cluster server -players {{MAX_PLAYERS}}'",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Setting breakpad minidump AppID\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## DST specific\r\nmkdir -p ~\/DoNotStarveTogether\/config\/server\/\r\necho \"${SERVER_TOKEN}\" >> ~\/DoNotStarveTogether\/config\/server\/cluster_token.txt",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Max Players",
+            "description": "Set the maximum number of players that will be allowed to join the game. This option overrides the [GAMEPLAY] \/ max_players setting in cluster.ini.",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "4",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|integer|between:1,31"
+        },
+        {
+            "name": "Server Token",
+            "description": "Required to run a public server. This needs to be generated from in game.",
+            "env_variable": "SERVER_TOKEN",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:64"
+        },
+        {
+            "name": "App ID",
+            "description": "Steam Server App ID",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "343050",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/steamcmd_servers/dont_starve/egg-don-t-starve.json b/steamcmd_servers/dont_starve/egg-don-t-starve.json
deleted file mode 100644
index e5c44d3f..00000000
--- a/steamcmd_servers/dont_starve/egg-don-t-starve.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
-    "meta": {
-        "version": "PTDL_v1"
-    },
-    "exported_at": "2018-10-06T20:21:42-04:00",
-    "name": "Don't Starve",
-    "author": "parker@parkervcp.com",
-    "description": "Don\u2019t Starve is an uncompromising wilderness survival game full of science and magic.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:source",
-    "startup": "'cd bin && .\/dontstarve_dedicated_server_nullrenderer -bind_ip 0.0.0.0 -port {{SERVER_PORT}} -console -persistent_storage_root \/home\/container\/DoNotStarveTogether -conf_dir config -cluster server -players {{MAX_PLAYERS}}'",
-    "config": {
-        "files": "{}",
-        "startup": "{\r\n    \"done\": \"Setting breakpad minidump AppID\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{}",
-        "stop": "^C"
-    },
-    "scripts": {
-        "installation": {
-            "script": "#!\/bin\/bash\r\n# Don't Starve Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 343050 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\nmkdir -p ~\/DoNotStarveTogether\/config\/server\/\r\necho \"${SERVER_TOKEN}\" >> ~\/DoNotStarveTogether\/config\/server\/cluster_token.txt",
-            "container": "ubuntu:18.04",
-            "entrypoint": "bash"
-        }
-    },
-    "variables": [
-        {
-            "name": "Max Players",
-            "description": "Set the maximum number of players that will be allowed to join the game. This option overrides the [GAMEPLAY] \/ max_players setting in cluster.ini.",
-            "env_variable": "MAX_PLAYERS",
-            "default_value": "4",
-            "user_viewable": 1,
-            "user_editable": 0,
-            "rules": "required|integer|between:1,31"
-        },
-        {
-            "name": "Server Token",
-            "description": "Required to run a public server. This needs to be generated from in game.",
-            "env_variable": "SERVER_TOKEN",
-            "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|string|max:64"
-        }
-    ]
-}
\ No newline at end of file

From edb17018d996827b55fd91027c068fd7c3e1b201 Mon Sep 17 00:00:00 2001
From: Callum Morris <me@callum.io>
Date: Wed, 1 Apr 2020 20:51:28 +0100
Subject: [PATCH 15/48] Update TShock to v4.3.26

Update TShock to v4.3.26 - Released 2019-04-01

https://github.com/Pryaxis/TShock/releases
---
 terraria/tshock/egg-tshock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraria/tshock/egg-tshock.json b/terraria/tshock/egg-tshock.json
index a13bf77f..b47c2157 100644
--- a/terraria/tshock/egg-tshock.json
+++ b/terraria/tshock/egg-tshock.json
@@ -54,7 +54,7 @@
             "name": "Tshock Version",
             "description": "The version on tshock that will be installed.",
             "env_variable": "TSHOCK_VERSION",
-            "default_value": "4.3.25",
+            "default_value": "4.3.26",
             "user_viewable": 1,
             "user_editable": 0,
             "rules": "required|string|max:20"

From ff1cee4a0a071b7aa2b1e54ada9913c64fe6acb2 Mon Sep 17 00:00:00 2001
From: James76931 <james76931@me.com>
Date: Thu, 2 Apr 2020 19:38:33 +0100
Subject: [PATCH 16/48] Make Tuinity stop gracefully

---
 minecraft_java/tuinity/egg-tuinity.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/minecraft_java/tuinity/egg-tuinity.json b/minecraft_java/tuinity/egg-tuinity.json
index 8585f1d3..d18404cb 100644
--- a/minecraft_java/tuinity/egg-tuinity.json
+++ b/minecraft_java/tuinity/egg-tuinity.json
@@ -13,7 +13,7 @@
         "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
         "logs": "{}",
-        "stop": "^C"
+        "stop": "stop"
     },
     "scripts": {
         "installation": {
@@ -33,4 +33,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}

From 7a87ac173d6222d15c5c978cdbd43f80c8faee75 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Fri, 3 Apr 2020 12:52:11 -0400
Subject: [PATCH 17/48] update parkertron egg

---
 bots/discord/parkertron/egg-parkertron.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bots/discord/parkertron/egg-parkertron.json b/bots/discord/parkertron/egg-parkertron.json
index 8be2cbec..ce098ba8 100644
--- a/bots/discord/parkertron/egg-parkertron.json
+++ b/bots/discord/parkertron/egg-parkertron.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2019-02-17T12:34:32-05:00",
+    "exported_at": "2020-04-03T12:50:58-04:00",
     "name": "parkertron",
     "author": "parker@parkervcp.com",
     "description": "The stupid chatbot parkertron by Parkervcp.\r\n\r\nhttps:\/\/github.com\/parkervcp\/parkertron",
@@ -13,12 +13,12 @@
         "files": "{}",
         "startup": "{\r\n    \"done\": \"Bot is now running\"\r\n}",
         "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
-        "stop": "^C"
+        "stop": "shutdown"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# parkertron Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nexport GOPATH=$HOME\/go\r\nexport PATH=$GOROOT\/bin:$GOPATH\/bin:$PATH\r\n\r\ncd\r\n\r\napk add --no-cache --update git curl lua-stdlib lua musl-dev g++ libc-dev tesseract-ocr tesseract-ocr-dev\r\n\r\necho \"pulling the parkertron pterodactyl branch\"\r\n\r\ngit clone https:\/\/github.com\/parkervcp\/parkertron.git\r\n\r\ncd parkertron\/\r\n\r\necho \"building parkertron\"\r\n\r\ngo build \r\n\r\necho \"build complete copying parkertron and example configs over\"\r\n\r\ncp parkertron \/mnt\/server\/\r\n\r\nif [ -d \"$DIRECTORY\" ]; then\r\n    echo \"Files exist already\"\r\nelse\r\n    cp configs\/ \/mnt\/server\/\r\nfi\r\n\r\necho \"Install complete. If you watched this. Congrats.\"",
-            "container": "golang:1.11-alpine",
+            "script": "#!\/bin\/ash\r\n# parkertron Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nexport GOPATH=$HOME\/go\r\nexport PATH=$GOROOT\/bin:$GOPATH\/bin:$PATH\r\n\r\ncd\r\n\r\napk add --no-cache --update git curl lua-stdlib lua musl-dev g++ libc-dev tesseract-ocr tesseract-ocr-dev\r\n\r\necho \"pulling the parkertron pterodactyl branch\"\r\n\r\ngit clone https:\/\/github.com\/parkervcp\/parkertron.git\r\n\r\ncd parkertron\/\r\n\r\ngo mod download\r\n\r\necho \"building parkertron\"\r\n\r\ngo build \r\n\r\necho \"build complete copying parkertron and example configs over\"\r\n\r\ncp parkertron \/mnt\/server\/\r\n\r\nif [ -d \/mnt\/server\/configs ]; then\r\n    echo \"Files exist already\"\r\nelse\r\n    cp -r \/root\/parkertron\/configs\/ \/mnt\/server\/\r\nfi\r\n\r\necho \"Install complete. If you watched this. Congrats.\"",
+            "container": "golang:1.14-alpine",
             "entrypoint": "ash"
         }
     },

From d219e04d28a7b8cd67272bdaa638041c72e5328b Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Tue, 14 Apr 2020 13:23:46 -0400
Subject: [PATCH 18/48] fix download link for forge

Fixes corrupted jar issue
---
 minecraft_java/forge/forge/egg-forge-enhanced.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/minecraft_java/forge/forge/egg-forge-enhanced.json b/minecraft_java/forge/forge/egg-forge-enhanced.json
index c97fa8a6..c3071ab0 100644
--- a/minecraft_java/forge/forge/egg-forge-enhanced.json
+++ b/minecraft_java/forge/forge/egg-forge-enhanced.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2019-12-01T20:05:28-05:00",
+    "exported_at": "2020-04-14T13:21:38-04:00",
     "name": "Forge Enhanced",
     "author": "parker@parkervcp.com",
     "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n    echo -e \"getting latest recommended version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage')\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; then\r\n\techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n\texit 1\r\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\nif [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\nelse\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n            if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-universal.jar; then\r\n            echo -e \"universal jar download link is valid.\"\r\n        else\r\n            echo -e \"link is invalid closing out\"\r\n            exit 3\r\n        fi\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\ncurl -s -o $SERVER_JARFILE -sS ${DOWNLOAD_LINK}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
+            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n    echo -e \"getting latest recommended version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage' | sed \"s\/http:\/https:\/g\")\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; then\r\n\techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n\texit 1\r\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n\r\n\r\nif [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\nelse\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n            if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-universal.jar; then\r\n            echo -e \"universal jar download link is valid.\"\r\n        else\r\n            echo -e \"link is invalid closing out\"\r\n            exit 3\r\n        fi\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\ncurl -s -o $SERVER_JARFILE -sS ${DOWNLOAD_LINK}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
             "container": "openjdk:8-jdk-slim",
             "entrypoint": "bash"
         }

From 0110a94ca28203133ca9c8cb6d5446c3d56bf3d2 Mon Sep 17 00:00:00 2001
From: Sean McRobbie <accounts+gitkraken@seanmcr.co.uk>
Date: Thu, 16 Apr 2020 18:28:54 +0200
Subject: [PATCH 19/48] fix openttd install fails due to missing curl command

---
 tycoon_games/openttd/egg-open-t-t-d-server.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tycoon_games/openttd/egg-open-t-t-d-server.json b/tycoon_games/openttd/egg-open-t-t-d-server.json
index 89b5bb1b..2f7a89fd 100644
--- a/tycoon_games/openttd/egg-open-t-t-d-server.json
+++ b/tycoon_games/openttd/egg-open-t-t-d-server.json
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n\r\napk add --no-cache wget binutils xz\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting file from: https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb\"\r\n\r\nwget https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb -O openttd.deb\r\n\r\nar -x  openttd.deb\r\n\r\ntar -xvf data.tar.xz\r\n\r\nmv usr\/share\/games\/openttd\/* .\/\r\n\r\nmv usr\/games\/openttd .\/\r\n\r\nchmod +x openttd\r\n\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/${OPENGFX_VERSION}\/opengfx-${OPENGFX_VERSION}-all.zip -O opengfx.zip\r\n\r\nunzip opengfx.zip \r\n\r\ntar --strip-components=1 -C baseset\/ -xvf opengfx*.tar\r\n\r\nrm open*zip open*tar open*gz debian-binary open*deb\r\n\r\n[ -f \/home\/container\/openttd.cfg  ] || curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/tycoon_games\/openttd\/openttd.cfg > openttd.cfg",
+            "script": "#!\/bin\/ash\r\n\r\napk add --no-cache wget binutils xz curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting file from: https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb\"\r\n\r\nwget https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb -O openttd.deb\r\n\r\nar -x  openttd.deb\r\n\r\ntar -xvf data.tar.xz\r\n\r\nmv usr\/share\/games\/openttd\/* .\/\r\n\r\nmv usr\/games\/openttd .\/\r\n\r\nchmod +x openttd\r\n\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/${OPENGFX_VERSION}\/opengfx-${OPENGFX_VERSION}-all.zip -O opengfx.zip\r\n\r\nunzip opengfx.zip \r\n\r\ntar --strip-components=1 -C baseset\/ -xvf opengfx*.tar\r\n\r\nrm open*zip open*tar open*gz debian-binary open*deb\r\n\r\n[ -f \/home\/container\/openttd.cfg  ] || curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/tycoon_games\/openttd\/openttd.cfg > openttd.cfg",
             "container": "alpine:3.10",
             "entrypoint": "ash"
         }

From 67033a431f9a16ba25ee4d4f563dd9a3ebd877cd Mon Sep 17 00:00:00 2001
From: Sean McRobbie <accounts+gitkraken@seanmcr.co.uk>
Date: Thu, 16 Apr 2020 18:31:24 +0200
Subject: [PATCH 20/48] fix openttd opengfx url has changed

---
 tycoon_games/openttd/egg-open-t-t-d-server.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tycoon_games/openttd/egg-open-t-t-d-server.json b/tycoon_games/openttd/egg-open-t-t-d-server.json
index 2f7a89fd..f2dcb036 100644
--- a/tycoon_games/openttd/egg-open-t-t-d-server.json
+++ b/tycoon_games/openttd/egg-open-t-t-d-server.json
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n\r\napk add --no-cache wget binutils xz curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting file from: https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb\"\r\n\r\nwget https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb -O openttd.deb\r\n\r\nar -x  openttd.deb\r\n\r\ntar -xvf data.tar.xz\r\n\r\nmv usr\/share\/games\/openttd\/* .\/\r\n\r\nmv usr\/games\/openttd .\/\r\n\r\nchmod +x openttd\r\n\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/${OPENGFX_VERSION}\/opengfx-${OPENGFX_VERSION}-all.zip -O opengfx.zip\r\n\r\nunzip opengfx.zip \r\n\r\ntar --strip-components=1 -C baseset\/ -xvf opengfx*.tar\r\n\r\nrm open*zip open*tar open*gz debian-binary open*deb\r\n\r\n[ -f \/home\/container\/openttd.cfg  ] || curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/tycoon_games\/openttd\/openttd.cfg > openttd.cfg",
+            "script": "#!\/bin\/ash\r\n\r\napk add --no-cache wget binutils xz curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting file from: https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb\"\r\n\r\nwget https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb -O openttd.deb\r\n\r\nar -x  openttd.deb\r\n\r\ntar -xvf data.tar.xz\r\n\r\nmv usr\/share\/games\/openttd\/* .\/\r\n\r\nmv usr\/games\/openttd .\/\r\n\r\nchmod +x openttd\r\n\r\nwget https:\/\/cdn.openttd.org\/opengfx-releases\/${OPENGFX_VERSION}\/opengfx-${OPENGFX_VERSION}-all.zip -O opengfx.zip\r\n\r\nunzip opengfx.zip \r\n\r\ntar --strip-components=1 -C baseset\/ -xvf opengfx*.tar\r\n\r\nrm open*zip open*tar open*gz debian-binary open*deb\r\n\r\n[ -f \/home\/container\/openttd.cfg  ] || curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/tycoon_games\/openttd\/openttd.cfg > openttd.cfg",
             "container": "alpine:3.10",
             "entrypoint": "ash"
         }

From 4d53e2acfd29124c48a75015a6bcfff24a210ad6 Mon Sep 17 00:00:00 2001
From: Sean McRobbie <accounts+gitkraken@seanmcr.co.uk>
Date: Thu, 16 Apr 2020 18:32:01 +0200
Subject: [PATCH 21/48] update openttd to 1.10.1 and opengfx to 0.6.0

---
 tycoon_games/openttd/egg-open-t-t-d-server.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tycoon_games/openttd/egg-open-t-t-d-server.json b/tycoon_games/openttd/egg-open-t-t-d-server.json
index f2dcb036..c2b4f8a0 100644
--- a/tycoon_games/openttd/egg-open-t-t-d-server.json
+++ b/tycoon_games/openttd/egg-open-t-t-d-server.json
@@ -43,18 +43,18 @@
         },
         {
             "name": "OpenTTD Version",
-            "description": "The version of OpenTTD i.e. 1.9.1",
+            "description": "The version of OpenTTD i.e. 1.10.1",
             "env_variable": "OPENTTD_VERSION",
-            "default_value": "1.9.1",
+            "default_value": "1.10.1",
             "user_viewable": 1,
             "user_editable": 0,
             "rules": "required|string|max:20"
         },
         {
             "name": "OpenGFX Version",
-            "description": "The OpenGFX Version i.e. 0.5.5",
+            "description": "The OpenGFX Version i.e. 0.6.0",
             "env_variable": "OPENGFX_VERSION",
-            "default_value": "0.5.5",
+            "default_value": "0.6.0",
             "user_viewable": 1,
             "user_editable": 0,
             "rules": "required|string|max:20"

From 6f0004ee9b22e8eb6fe2c70a7fb9ffdeec48f2ca Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Thu, 16 Apr 2020 20:32:37 -0400
Subject: [PATCH 22/48] update forge install script

Update to use https all the time
---
 minecraft_java/forge/forge/egg-forge-enhanced.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/minecraft_java/forge/forge/egg-forge-enhanced.json b/minecraft_java/forge/forge/egg-forge-enhanced.json
index c97fa8a6..b104b7ed 100644
--- a/minecraft_java/forge/forge/egg-forge-enhanced.json
+++ b/minecraft_java/forge/forge/egg-forge-enhanced.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2019-12-01T20:05:28-05:00",
+    "exported_at": "2020-04-16T20:29:22-04:00",
     "name": "Forge Enhanced",
     "author": "parker@parkervcp.com",
     "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n    echo -e \"getting latest recommended version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage')\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; then\r\n\techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n\texit 1\r\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\nif [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\nelse\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n            if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-universal.jar; then\r\n            echo -e \"universal jar download link is valid.\"\r\n        else\r\n            echo -e \"link is invalid closing out\"\r\n            exit 3\r\n        fi\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\ncurl -s -o $SERVER_JARFILE -sS ${DOWNLOAD_LINK}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
+            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n    echo -e \"getting latest recommended version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage' | sed \"s\/http:\/https:\/g\")\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; then\r\n\techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n\texit 1\r\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n\r\n\r\nif [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\nelse\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n            if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-universal.jar; then\r\n            echo -e \"universal jar download link is valid.\"\r\n        else\r\n            echo -e \"link is invalid closing out\"\r\n            exit 3\r\n        fi\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\ncurl -s -o $SERVER_JARFILE -sS ${DOWNLOAD_LINK}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
             "container": "openjdk:8-jdk-slim",
             "entrypoint": "bash"
         }

From 61bc8b83089e16f0bf4555cc0d84f8a3cf160cce Mon Sep 17 00:00:00 2001
From: Stijn Bannink <27051051+stijnb1234@users.noreply.github.com>
Date: Fri, 17 Apr 2020 11:30:45 +0200
Subject: [PATCH 23/48] Fixed magma url in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ffb821d1..b4ccfbee 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Cuberite](/minecraft_java/cuberite/)
 * [Forge](/minecraft_java/forge/)
 * [Feed The Beast](/minecraft_java/ftb/)
-* [Magma](/minecraft/magma/)
+* [Magma](/minecraft_java/magma/)
 * [Paper](/minecraft_java/paper)
 * [Spigot](/minecraft_java/spigot/)
 * [spongeforge](/minecraft_java/spongeforge/)

From 83cffa378f1ef16af94a8bb5557c63ad3864c01a Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sat, 18 Apr 2020 11:54:25 -0400
Subject: [PATCH 24/48] add basic hurtworld support

The game doesn't have a usable console as far as I can tell.
---
 README.md                                     |  1 +
 steamcmd_servers/README.md                    |  3 +
 steamcmd_servers/hurtworld/README.md          | 15 +++++
 steamcmd_servers/hurtworld/egg-hurtworld.json | 63 +++++++++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 steamcmd_servers/hurtworld/README.md
 create mode 100644 steamcmd_servers/hurtworld/egg-hurtworld.json

diff --git a/README.md b/README.md
index b4ccfbee..99de4998 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Don't Starve](/steamcmd_servers/dont_starve)
 * [ECO](/steamcmd_servers/eco/)
 * [HLDS server](/steamcmd_servers/hlds_server)
+* [Hurtworld](/steamcmd_servers/hurtworld)
 * [Mordhau](/steamcmd_servers/mordhau)
 * [Onset](/steamcmd_servers/onset)
 * [PixARK](/steamcmd_servers/pixark/)
diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md
index 5cef5d34..f793e9ba 100644
--- a/steamcmd_servers/README.md
+++ b/steamcmd_servers/README.md
@@ -25,6 +25,9 @@ This is a collection of servers that use steamcmd to install.
 ## HLDS Server
 [hlds](hlds_server/)
 
+## Hurtworld
+[hurtworld](hurtworld/)
+
 ## Mordhau
 [mordhau](mordhau/)
 
diff --git a/steamcmd_servers/hurtworld/README.md b/steamcmd_servers/hurtworld/README.md
new file mode 100644
index 00000000..eb62c64e
--- /dev/null
+++ b/steamcmd_servers/hurtworld/README.md
@@ -0,0 +1,15 @@
+# Hurtworld
+### From their [website](http://hurtworld.com/)
+
+### Install notes
+Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log.
+
+### Server Ports
+These are the servers required ports
+
+| Port    | default |
+|---------|---------|
+| Game    | 12871   |
+| Query   | 13871   |
+
+#### Mods/Plugins may require ports to be added to the server.
diff --git a/steamcmd_servers/hurtworld/egg-hurtworld.json b/steamcmd_servers/hurtworld/egg-hurtworld.json
new file mode 100644
index 00000000..5db3022f
--- /dev/null
+++ b/steamcmd_servers/hurtworld/egg-hurtworld.json
@@ -0,0 +1,63 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-04-16T20:41:27-04:00",
+    "name": "Hurtworld",
+    "author": "brycea@rapidnetworks.org",
+    "description": "Hurtworld is a hardcore multiplayer survival FPS with a focus on deep survival progression that doesn't become trivial once you establish some basic needs. Built for hardcore gamers, Hurtworld aims to punish.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source",
+    "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}};creativemode ${CREATIVE_MODE};${ADMINS}\" -logfile $1",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"orphaned items\"\r\n}",
+        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Game ID",
+            "description": "The ID corresponding to the game to download and run using SRCDS.",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "405100",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|regex:\/^(405100)$\/"
+        },
+        {
+            "name": "Query Port",
+            "description": "Server Query Default Port",
+            "env_variable": "QUERY_PORT",
+            "default_value": "13871",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|string"
+        },
+        {
+            "name": "Max Players",
+            "description": "Max players allowed on the server at one time.",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "60",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:60"
+        },
+        {
+            "name": "Server Name",
+            "description": "The name of your server in the public server list.",
+            "env_variable": "HOSTNAME",
+            "default_value": "A Hurtworld Server",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:50"
+        }
+    ]
+}
\ No newline at end of file

From 2e3b244230fc3d1c63207fdddeabdbc2ebbc7bae Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sat, 18 Apr 2020 15:34:09 -0400
Subject: [PATCH 25/48] add corpbot

adds corp bot

resolves #444
---
 README.md                               |  1 +
 bots/discord/corpbot/README.md          |  8 +++++
 bots/discord/corpbot/egg-corp-bot.json  | 45 +++++++++++++++++++++++++
 bots/discord/corpbot/settings_dict.json |  4 +++
 4 files changed, 58 insertions(+)
 create mode 100644 bots/discord/corpbot/README.md
 create mode 100644 bots/discord/corpbot/egg-corp-bot.json
 create mode 100644 bots/discord/corpbot/settings_dict.json

diff --git a/README.md b/README.md
index b4ccfbee..d9b768ca 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 [Discord](/bots/discord/)
 * [ATL Bot](/bots/discord/atlbot/) Node JS
 * [Bastion](/bots/discord/bastion/)
+* [CorpBot](/bots/discord/corpbot/) Python
 * [discord.js](bots/discord/discord.js/) Node JS generic
 * [fragbot](/bots/discord/fragbot/) Golang
 * [jmusicbot](/bots/discord/jmusicbot) Java
diff --git a/bots/discord/corpbot/README.md b/bots/discord/corpbot/README.md
new file mode 100644
index 00000000..2853d335
--- /dev/null
+++ b/bots/discord/corpbot/README.md
@@ -0,0 +1,8 @@
+# CorpBot.py
+### From their [Github](https://github.com/corpnewt/CorpBot.py)
+A very clumsy python bot for discord 
+
+### Server Ports
+No ports are required to run Big Brother Bot. You can assign a random port to the bot.
+
+#### Mods/Plugins may require ports to be added to the server.
diff --git a/bots/discord/corpbot/egg-corp-bot.json b/bots/discord/corpbot/egg-corp-bot.json
new file mode 100644
index 00000000..7bb94ea4
--- /dev/null
+++ b/bots/discord/corpbot/egg-corp-bot.json
@@ -0,0 +1,45 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-04-18T15:33:17-04:00",
+    "name": "CorpBot",
+    "author": "parker@parkervcp.com",
+    "description": "A very clumsy python bot for discord \r\n\r\nhttps:\/\/github.com\/corpnewt\/CorpBot.py",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:alpine_python-3",
+    "startup": "python Main.py",
+    "config": {
+        "files": "{\r\n    \"settings_dict.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"token\": \"{{server.build.env.TOKEN}}\",\r\n            \"prefix\": \"{{server.build.env.PREFIX}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Logged in as\"\r\n}",
+        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# CoprBot Install Script\r\n#\r\n## create dir is it doesn't exist\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n    mkdir \/mnt\/server\/\r\nfi\r\n\r\n## move to directory\r\ncd \/mnt\/server\/\r\n\r\n## install deps\r\napt update\r\napt install git gcc\r\n\r\n## git clone \r\ngit clone https:\/\/github.com\/corpnewt\/CorpBot.py.git .\r\n\r\n## Modify Install.py to work properly in egg format\r\nmv Install.py Install.py.orig\r\nsed -n '\/press enter to exit\/q;p' Install.py.orig > Install.py\r\nsed -i 's\/\"-U\"\/\"-U\", \"--target\", \"\\\/mnt\\\/server\\\/\"\/g' Install.py\r\n\r\n## run Install.py script\r\npython Install.py\r\n\r\n## get config during install\r\nif [ ! -f \/mnt\/server\/settings_dict.json ]; then\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/corpbot\/settings_dict.json\r\nfi",
+            "container": "python:3.8-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Discord Bot Token",
+            "description": "Get your own token here - https:\/\/discordapp.com\/developers\/applications\/",
+            "env_variable": "TOKEN",
+            "default_value": "GET_YOUR_OWN",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string"
+        },
+        {
+            "name": "Command Prefix",
+            "description": "The prefix for commands from the bot.",
+            "env_variable": "PREFIX",
+            "default_value": ".",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/bots/discord/corpbot/settings_dict.json b/bots/discord/corpbot/settings_dict.json
new file mode 100644
index 00000000..b876cabe
--- /dev/null
+++ b/bots/discord/corpbot/settings_dict.json
@@ -0,0 +1,4 @@
+{
+    "token": "your_token_here",
+    "prefix": "your_custom_prefix_here"
+}
\ No newline at end of file

From fe7a59a5ee472f9ef75a2877cb020d25ff4669d2 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sat, 18 Apr 2020 15:37:05 -0400
Subject: [PATCH 26/48] fix install script.

---
 bots/discord/corpbot/egg-corp-bot.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bots/discord/corpbot/egg-corp-bot.json b/bots/discord/corpbot/egg-corp-bot.json
index 7bb94ea4..1561ca58 100644
--- a/bots/discord/corpbot/egg-corp-bot.json
+++ b/bots/discord/corpbot/egg-corp-bot.json
@@ -3,11 +3,11 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-18T15:33:17-04:00",
+    "exported_at": "2020-04-18T15:36:40-04:00",
     "name": "CorpBot",
     "author": "parker@parkervcp.com",
     "description": "A very clumsy python bot for discord \r\n\r\nhttps:\/\/github.com\/corpnewt\/CorpBot.py",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:alpine_python-3",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_python-3.8",
     "startup": "python Main.py",
     "config": {
         "files": "{\r\n    \"settings_dict.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"token\": \"{{server.build.env.TOKEN}}\",\r\n            \"prefix\": \"{{server.build.env.PREFIX}}\"\r\n        }\r\n    }\r\n}",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# CoprBot Install Script\r\n#\r\n## create dir is it doesn't exist\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n    mkdir \/mnt\/server\/\r\nfi\r\n\r\n## move to directory\r\ncd \/mnt\/server\/\r\n\r\n## install deps\r\napt update\r\napt install git gcc\r\n\r\n## git clone \r\ngit clone https:\/\/github.com\/corpnewt\/CorpBot.py.git .\r\n\r\n## Modify Install.py to work properly in egg format\r\nmv Install.py Install.py.orig\r\nsed -n '\/press enter to exit\/q;p' Install.py.orig > Install.py\r\nsed -i 's\/\"-U\"\/\"-U\", \"--target\", \"\\\/mnt\\\/server\\\/\"\/g' Install.py\r\n\r\n## run Install.py script\r\npython Install.py\r\n\r\n## get config during install\r\nif [ ! -f \/mnt\/server\/settings_dict.json ]; then\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/corpbot\/settings_dict.json\r\nfi",
+            "script": "#!\/bin\/bash\r\n# CoprBot Install Script\r\n#\r\n## create dir is it doesn't exist\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n    mkdir \/mnt\/server\/\r\nfi\r\n\r\n## move to directory\r\ncd \/mnt\/server\/\r\n\r\n## install deps\r\napt update\r\napt install git gcc\r\n\r\n## git clone \r\ngit clone https:\/\/github.com\/corpnewt\/CorpBot.py.git .\r\n\r\n## Modify Install.py to work properly in egg format\r\nmv Install.py Install.py.orig\r\nsed -n '\/press enter to exit\/q;p' Install.py.orig > Install.py\r\nsed -i 's\/\"-U\"\/\"-U\", \"--target\", \"\\\/mnt\\\/server\\\/\"\/g' Install.py\r\n\r\n## run Install.py script\r\npython Install.py\r\n\r\n## get config during install\r\nif [ ! -f \/mnt\/server\/settings_dict.json ]; then\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/corpbot\/settings_dict.json -o settings_dict.json\r\nfi",
             "container": "python:3.8-slim",
             "entrypoint": "bash"
         }

From 85f7d6849641cca1f7c074819ccb6d91f645d481 Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Sun, 19 Apr 2020 13:32:07 +0200
Subject: [PATCH 27/48] Initial Comit

---
 README.md                                     |  3 +-
 steamcmd_servers/README.md                    |  5 +-
 steamcmd_servers/citadel/Game.ini             |  9 +++
 steamcmd_servers/citadel/README.md            |  9 +++
 .../egg-citadel--forged-with-fire.json        | 72 +++++++++++++++++++
 5 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 steamcmd_servers/citadel/Game.ini
 create mode 100644 steamcmd_servers/citadel/README.md
 create mode 100644 steamcmd_servers/citadel/egg-citadel--forged-with-fire.json

diff --git a/README.md b/README.md
index b4ccfbee..16b61b77 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [SpongeVanilla](/minecraft_java/spongevanilla/)
 * [Technic](/minecraft_java/technic/)
 * [VanillaCord](/minecraft_java/vanillacord/)
-* [Tuinity](/minecraft_java/tuinity/) 
+* [Tuinity](/minecraft_java/tuinity/)
 
 [Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft)
 * [Waterfall](/minecraft_proxy/waterfall/)
@@ -97,6 +97,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Arma](/steamcmd_servers/arma/)
   * [Arma 3](/steamcmd_servers/arma/arma3/)
   * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client/)
+* [Citadel: Forged with Fire](/steamcmd_servers/citadel)
 * [Conan Exiles](/steamcmd_servers/conan_exiles)
 * [Don't Starve](/steamcmd_servers/dont_starve)
 * [ECO](/steamcmd_servers/eco/)
diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md
index 5cef5d34..7142d22d 100644
--- a/steamcmd_servers/README.md
+++ b/steamcmd_servers/README.md
@@ -13,6 +13,9 @@ This is a collection of servers that use steamcmd to install.
 * [arma 3](arma/arma3/)
 * [arma 3 headless](arma/arma3_headless_client/)
 
+## Citadel: Forged with Fire
+[citadel](citadel/)
+
 ## Conan Exiles
 [conan_exiles](conan_exiles/)
 
@@ -51,4 +54,4 @@ This is a collection of servers that use steamcmd to install.
 
 ## Unturned
   * [RocketMod](rocketmod)
-  * [Unturned](unturned)
\ No newline at end of file
+  * [Unturned](unturned)
diff --git a/steamcmd_servers/citadel/Game.ini b/steamcmd_servers/citadel/Game.ini
new file mode 100644
index 00000000..4c481c71
--- /dev/null
+++ b/steamcmd_servers/citadel/Game.ini
@@ -0,0 +1,9 @@
+[UWorks]
+ConnectionPort=27015
+QueryPort=7777
+
+[/Script/Citadel.SocialManager]
+Password=changeme
+
+[/Script/Citadel.CitadelGameInstance]
+WorldCreationSettings=(ServerName="My Private Server",Password="",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)
diff --git a/steamcmd_servers/citadel/README.md b/steamcmd_servers/citadel/README.md
new file mode 100644
index 00000000..7204eedc
--- /dev/null
+++ b/steamcmd_servers/citadel/README.md
@@ -0,0 +1,9 @@
+# Citadel: Forged with fire
+Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.
+
+## Server Ports
+
+| Port  | default |
+|-------|---------|
+| Game  | 27015   |
+| Query | 7777   |
diff --git a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
new file mode 100644
index 00000000..43e2592d
--- /dev/null
+++ b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
@@ -0,0 +1,72 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-04-19T13:27:09+02:00",
+    "name": "Citadel: Forged with Fire",
+    "author": "info@goover.de",
+    "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "startup": ".\/CitadelServer.sh",
+    "config": {
+        "files": "{\r\n    \"Config\/Game.ini\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings={{server.build.env.WORLD_CREATION_SETTINGS}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Steam Server initialized and registered with UWorks\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\nchmod +x \/mnt\/server\/CitadelServer.sh",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Game ID",
+            "description": "ID",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "489650",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|numeric|digits_between:1,6"
+        },
+        {
+            "name": "Connection Port",
+            "description": "port",
+            "env_variable": "CON_PORT",
+            "default_value": "7777",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:100"
+        },
+        {
+            "name": "Query Port",
+            "description": "Query Port",
+            "env_variable": "QUERY_PORT",
+            "default_value": "27015",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Admin Password",
+            "description": "",
+            "env_variable": "ADMIN_PASSWD",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:100"
+        },
+        {
+            "name": "WorldCreationSettings",
+            "description": "Standard Setting. Change to your needs",
+            "env_variable": "WORLD_CREATION_SETTINGS",
+            "default_value": "(ServerName=\"My Citadel Server\",Password=\"YourServerPassword\",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string"
+        }
+    ]
+}
\ No newline at end of file

From 394160b31523863f215f3cb0f4c2d40ac734105b Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Sun, 19 Apr 2020 13:58:52 +0200
Subject: [PATCH 28/48] Updated Egg

---
 steamcmd_servers/citadel/Game.ini                        | 9 ---------
 .../citadel/egg-citadel--forged-with-fire.json           | 6 +++---
 2 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 steamcmd_servers/citadel/Game.ini

diff --git a/steamcmd_servers/citadel/Game.ini b/steamcmd_servers/citadel/Game.ini
deleted file mode 100644
index 4c481c71..00000000
--- a/steamcmd_servers/citadel/Game.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[UWorks]
-ConnectionPort=27015
-QueryPort=7777
-
-[/Script/Citadel.SocialManager]
-Password=changeme
-
-[/Script/Citadel.CitadelGameInstance]
-WorldCreationSettings=(ServerName="My Private Server",Password="",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)
diff --git a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
index 43e2592d..77fabc57 100644
--- a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
+++ b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
@@ -3,21 +3,21 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-19T13:27:09+02:00",
+    "exported_at": "2020-04-19T13:58:24+02:00",
     "name": "Citadel: Forged with Fire",
     "author": "info@goover.de",
     "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
     "startup": ".\/CitadelServer.sh",
     "config": {
-        "files": "{\r\n    \"Config\/Game.ini\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings={{server.build.env.WORLD_CREATION_SETTINGS}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"Citadel\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings={{server.build.env.WORLD_CREATION_SETTINGS}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Steam Server initialized and registered with UWorks\",\r\n    \"userInteraction\": []\r\n}",
         "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
         "stop": "^C"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\nchmod +x \/mnt\/server\/CitadelServer.sh",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n# Create Game.ini\r\nrm -rf \/mnt\/server\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat <<EOT >> \/mnt\/server\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\n[UWorks]\r\nConnectionPort=27015\r\nQueryPort=7777\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"My Private Server\",Password=\"\",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)\r\nEOT\r\n\r\nchmod +x \/mnt\/server\/CitadelServer.sh",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }

From bdd786b62725a5dcaac789e50f5f4cd6423fef62 Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Mon, 20 Apr 2020 08:04:21 +0200
Subject: [PATCH 29/48] Updated String

---
 .../egg-citadel--forged-with-fire.json        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
index 77fabc57..4ebdcf73 100644
--- a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
+++ b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
@@ -3,21 +3,21 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-19T13:58:24+02:00",
+    "exported_at": "2020-04-20T08:03:00+02:00",
     "name": "Citadel: Forged with Fire",
     "author": "info@goover.de",
     "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
     "startup": ".\/CitadelServer.sh",
     "config": {
-        "files": "{\r\n    \"Citadel\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings={{server.build.env.WORLD_CREATION_SETTINGS}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"Citadel\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings=({{server.build.env.WORLD_CREATION_SETTINGS}})\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Steam Server initialized and registered with UWorks\",\r\n    \"userInteraction\": []\r\n}",
         "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
         "stop": "^C"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so \/mnt\/server\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n# Create Game.ini\r\nrm -rf \/mnt\/server\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat <<EOT >> \/mnt\/server\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\n[UWorks]\r\nConnectionPort=27015\r\nQueryPort=7777\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"My Private Server\",Password=\"\",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)\r\nEOT\r\n\r\nchmod +x \/mnt\/server\/CitadelServer.sh",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n# Create Game.ini\r\nrm -rf $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat <<EOT > $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\n[UWorks]\r\nConnectionPort=27015\r\nQueryPort=7777\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"My Private Server\",Password=\"\",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)\r\nEOT\r\n\r\nchmod +x $HOME\/CitadelServer.sh",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
@@ -39,7 +39,7 @@
             "default_value": "7777",
             "user_viewable": 1,
             "user_editable": 1,
-            "rules": "required|string|max:100"
+            "rules": "required|string|max:5"
         },
         {
             "name": "Query Port",
@@ -48,7 +48,7 @@
             "default_value": "27015",
             "user_viewable": 1,
             "user_editable": 1,
-            "rules": "required|string|max:20"
+            "rules": "required|string|max:5"
         },
         {
             "name": "Admin Password",
@@ -57,16 +57,16 @@
             "default_value": "",
             "user_viewable": 1,
             "user_editable": 1,
-            "rules": "required|string|max:100"
+            "rules": "required|string|max:20"
         },
         {
-            "name": "WorldCreationSettings",
-            "description": "Standard Setting. Change to your needs",
+            "name": "World Creation Settings",
+            "description": "Pls define SERVERNAME, PASSWORT to join Server, MAX PLAYERS and SERVER MODE !!!",
             "env_variable": "WORLD_CREATION_SETTINGS",
-            "default_value": "(ServerName=\"My Citadel Server\",Password=\"YourServerPassword\",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)",
+            "default_value": "WorldCreationSettings=(ServerName=\"My Private Server\",Password=\"\",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)",
             "user_viewable": 1,
             "user_editable": 1,
-            "rules": "required|string"
+            "rules": "required"
         }
     ]
 }
\ No newline at end of file

From 86f6c3a36bb9f05bbc72b7a984b70d7fe3312ae5 Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Mon, 20 Apr 2020 08:14:29 +0200
Subject: [PATCH 30/48] small fix

---
 .../citadel/egg-citadel--forged-with-fire.json            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
index 4ebdcf73..48ab9871 100644
--- a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
+++ b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-20T08:03:00+02:00",
+    "exported_at": "2020-04-20T08:14:02+02:00",
     "name": "Citadel: Forged with Fire",
     "author": "info@goover.de",
     "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
@@ -36,7 +36,7 @@
             "name": "Connection Port",
             "description": "port",
             "env_variable": "CON_PORT",
-            "default_value": "7777",
+            "default_value": "27105",
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "required|string|max:5"
@@ -45,7 +45,7 @@
             "name": "Query Port",
             "description": "Query Port",
             "env_variable": "QUERY_PORT",
-            "default_value": "27015",
+            "default_value": "7777",
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "required|string|max:5"
@@ -63,7 +63,7 @@
             "name": "World Creation Settings",
             "description": "Pls define SERVERNAME, PASSWORT to join Server, MAX PLAYERS and SERVER MODE !!!",
             "env_variable": "WORLD_CREATION_SETTINGS",
-            "default_value": "WorldCreationSettings=(ServerName=\"My Private Server\",Password=\"\",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)",
+            "default_value": "WorldCreationSettings=(ServerName=\"My Private Server\",Password=\"\",ServerType=PVP,PlayerLimit=40,bPrivate=false,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)",
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "required"

From 8a02f2de644c9000988c115dfe82db74eb7697f0 Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Mon, 20 Apr 2020 08:39:11 +0200
Subject: [PATCH 31/48] Small Fixes, butt still WIP.

---
 .../citadel/egg-citadel--forged-with-fire.json    | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
index 48ab9871..510e8990 100644
--- a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
+++ b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
@@ -3,14 +3,14 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-20T08:14:02+02:00",
+    "exported_at": "2020-04-20T08:38:47+02:00",
     "name": "Citadel: Forged with Fire",
     "author": "info@goover.de",
     "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
     "startup": ".\/CitadelServer.sh",
     "config": {
-        "files": "{\r\n    \"Citadel\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings=({{server.build.env.WORLD_CREATION_SETTINGS}})\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"Citadel\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"ConnectionPort=\": \"ConnectionPort={{server.build.default.port}}\",\r\n            \"QueryPort=\": \"QueryPort={{server.build.env.QPORT}}\",\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings=({{server.build.env.WORLD_CREATION_SETTINGS}})\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Steam Server initialized and registered with UWorks\",\r\n    \"userInteraction\": []\r\n}",
         "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
         "stop": "^C"
@@ -32,19 +32,10 @@
             "user_editable": 0,
             "rules": "required|numeric|digits_between:1,6"
         },
-        {
-            "name": "Connection Port",
-            "description": "port",
-            "env_variable": "CON_PORT",
-            "default_value": "27105",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|string|max:5"
-        },
         {
             "name": "Query Port",
             "description": "Query Port",
-            "env_variable": "QUERY_PORT",
+            "env_variable": "QPORT",
             "default_value": "7777",
             "user_viewable": 1,
             "user_editable": 1,

From 460827d64c5278335743b628b11d7eef5820d42b Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Mon, 20 Apr 2020 08:58:20 +0200
Subject: [PATCH 32/48] Now it works :)

---
 .../citadel/egg-citadel--forged-with-fire.json            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
index 510e8990..53dc9bc4 100644
--- a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
+++ b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
@@ -3,14 +3,14 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-20T08:38:47+02:00",
+    "exported_at": "2020-04-20T08:58:00+02:00",
     "name": "Citadel: Forged with Fire",
     "author": "info@goover.de",
     "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
     "startup": ".\/CitadelServer.sh",
     "config": {
-        "files": "{\r\n    \"Citadel\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"ConnectionPort=\": \"ConnectionPort={{server.build.default.port}}\",\r\n            \"QueryPort=\": \"QueryPort={{server.build.env.QPORT}}\",\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings=({{server.build.env.WORLD_CREATION_SETTINGS}})\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"Citadel\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"ConnectionPort=\": \"ConnectionPort={{server.build.env.CPORT}}\",\r\n            \"QueryPort=\": \"QueryPort={{server.build.default.port}}\",\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings=({{server.build.env.WORLD_CREATION_SETTINGS}})\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Steam Server initialized and registered with UWorks\",\r\n    \"userInteraction\": []\r\n}",
         "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
         "stop": "^C"
@@ -33,9 +33,9 @@
             "rules": "required|numeric|digits_between:1,6"
         },
         {
-            "name": "Query Port",
+            "name": "Connection Port",
             "description": "Query Port",
-            "env_variable": "QPORT",
+            "env_variable": "CPORT",
             "default_value": "7777",
             "user_viewable": 1,
             "user_editable": 1,

From b0b1ca98e9ce76ef45f8ec4304ff778387f6c8b8 Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Mon, 20 Apr 2020 09:00:18 +0200
Subject: [PATCH 33/48] Update Readme

---
 steamcmd_servers/citadel/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/steamcmd_servers/citadel/README.md b/steamcmd_servers/citadel/README.md
index 7204eedc..38185635 100644
--- a/steamcmd_servers/citadel/README.md
+++ b/steamcmd_servers/citadel/README.md
@@ -5,5 +5,5 @@ Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical wo
 
 | Port  | default |
 |-------|---------|
-| Game  | 27015   |
-| Query | 7777   |
+| Game  | 7777    |
+| Query | 27015   |

From ce6d9306ab6e504f79010451186fbac7b59067e4 Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Mon, 20 Apr 2020 12:21:29 +0200
Subject: [PATCH 34/48] Initial Commit

---
 README.md                                     |  5 +-
 minecraft_bedrock/README.md                   |  4 ++
 minecraft_bedrock/dragon_proxy/README.md      | 15 +++++
 .../dragon_proxy/egg-dragon-proxy.json        | 63 +++++++++++++++++++
 4 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 minecraft_bedrock/dragon_proxy/README.md
 create mode 100644 minecraft_bedrock/dragon_proxy/egg-dragon-proxy.json

diff --git a/README.md b/README.md
index 99de4998..de878e52 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,8 @@ If you are reading this it looks like you are looking to add an egg to your serv
 [Mindusrty](/mindustry/)
 
 [Minecraft Bedrock](/minecraft_bedrock/)  
-* [Bedrock](/minecraft_bedrock/bedrock/)  
+* [Bedrock](/minecraft_bedrock/bedrock/)
+* [DragonProxy](/minecraft_bedrock/dragonproxy/)  
 * [Nukkit](/minecraft_bedrock/nukkit/)  
 * [PocketMine MP](/minecraft_bedrock/pocketmine_mp/)  
 
@@ -81,7 +82,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [SpongeVanilla](/minecraft_java/spongevanilla/)
 * [Technic](/minecraft_java/technic/)
 * [VanillaCord](/minecraft_java/vanillacord/)
-* [Tuinity](/minecraft_java/tuinity/) 
+* [Tuinity](/minecraft_java/tuinity/)
 
 [Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft)
 * [Waterfall](/minecraft_proxy/waterfall/)
diff --git a/minecraft_bedrock/README.md b/minecraft_bedrock/README.md
index 5dd20afa..62935699 100644
--- a/minecraft_bedrock/README.md
+++ b/minecraft_bedrock/README.md
@@ -4,6 +4,10 @@
 [Minecraft Bedrock Server](https://minecraft.net/en-us/download/server/bedrock/)
 The official Minecraft Bedrock (Formerly Minecraft Pocket Edition) server.
 
+#### DragonProxy
+[DragonProxy Github](https://github.com/DragonetMC/DragonProxy)
+A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers.
+
 #### Nukkit
 [Nukkit GitHub](https://github.com/Nukkit/Nukkit)  
 Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition  
diff --git a/minecraft_bedrock/dragon_proxy/README.md b/minecraft_bedrock/dragon_proxy/README.md
new file mode 100644
index 00000000..05889c65
--- /dev/null
+++ b/minecraft_bedrock/dragon_proxy/README.md
@@ -0,0 +1,15 @@
+# DragonProxy
+
+A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers.
+
+### Server Ports
+
+DragonProxy need 2 port (default 19132)
+
+| Port    | default  |
+|---------|----------|
+| Bind    | 19132    |
+| Remote  | 25565    |
+
+### Known Issues
+Also see the [DragonProxy Github](https://github.com/DragonetMC/DragonProxy)
diff --git a/minecraft_bedrock/dragon_proxy/egg-dragon-proxy.json b/minecraft_bedrock/dragon_proxy/egg-dragon-proxy.json
new file mode 100644
index 00000000..0dcfcd27
--- /dev/null
+++ b/minecraft_bedrock/dragon_proxy/egg-dragon-proxy.json
@@ -0,0 +1,63 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-04-20T12:13:53+02:00",
+    "name": "DragonProxy",
+    "author": "info@goover.de",
+    "description": "A proxy made to allow Minecraft: Bedrock Edition clients to connect to Minecraft: Java Edition servers.",
+    "image": "quay.io\/pterodactyl\/core:java",
+    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar DragonProxy.jar",
+    "config": {
+        "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"bind-port:\": \"bind-port: {{server.build.default.port}}\",\r\n            \"max-players:\": \"max-players: {{server.build.env.MAX_PLAYERS}}\",\r\n            \"remote-port:\": \"remote-port: {{server.build.env.RPORT}}\",\r\n            \"remote-auth:\": \"remote-auth: {{server.build.env.REMOTE_AUTH}}\",\r\n            \"xbox-auth:\": \"xbox-auth: {{server.build.env.XBOX_AUTH}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Done\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "[]",
+        "stop": "stop"
+    },
+    "scripts": {
+        "installation": {
+            "script": "apk update\r\napk --no-cache --update add curl jq wget\r\n\r\ncd \/mnt\/server\r\nrm -rf DragonProxy.jar\r\nwget https:\/\/ci.codemc.io\/job\/DragonetMC\/job\/DragonProxy\/lastBuild\/artifact\/bootstrap\/standalone\/target\/DragonProxy.jar\r\n\r\nrm -rf \/mnt\/server\/config.yml\r\ncat <<EOT > \/mnt\/server\/config.yml\r\n# -----------------------------------------------\r\n#   DragonProxy Configuration (25\/03\/20)\r\n#   https:\/\/github.com\/DragonetMC\/DragonProxy\r\n# -----------------------------------------------\r\n# DO NOT CHANGE THIS VARIABLE!!!!!!\r\nconfig-version: 2\r\n# DO NOT CHANGE THIS VARIABLE!!!!!!\r\n\r\nlocale: 'EN'\r\n\r\n# The IP and port the proxy will listen for connections on\r\n# '0.0.0.0' will bind to all IP addresses available on your device\r\nbind-address: '0.0.0.0'\r\nbind-port: 19132\r\n\r\n# The MOTD that will be shown on the MCPE server list\r\nmotd: 'DragonProxy'\r\nmotd2: 'https:\/\/github.com\/DragonetMC\/DragonProxy'\r\n\r\n# The maximum amount of players that can join the proxy\r\nmax-players: 1\r\n\r\n# The IP and port of the remote server to connect to\r\nremote-address: '127.0.0.1'\r\nremote-port: 25565\r\n\r\n# The authentication method used for connecting to the remote server.\r\n# Accepted values:\r\n#   credentials   : This will display a form when you join the proxy asking you to enter your Mojang credentials\r\n#   offline       :  No authentication, cant join premium servers such as Hypixel\r\nremote-auth: credentials\r\n\r\n# Whether or not Bedrock clients should be authenticated with xbox live\r\nxbox-auth: false\r\n\r\n# Whether or not to use the motd and player count of the primary remote server\r\nping-passthrough: true\r\n\r\n# Player gameplay related settings\r\nplayer-settings:\r\n  # Whether or not to translate commands sent from the remote server and display\r\n  # them on the Bedrock client. This is currently experimental.\r\n  enable-commands: false\r\n\r\n  # Whether or not to enable auto jump\r\n  auto-jump: true\r\n\r\n  # Whether or not to fetch skins from Mojang's servers\r\n  fetch-skins: true\r\n\r\nmetrics:\r\n  enabled: true\r\n  # DO NOT CHANGE\r\n  server-uuid: donotchange_serveruuid\r\n\r\n# The amount of threads that will be used.\r\n# Only change if you know what you are doing\r\nthread-pool-size: 8\r\nEOT",
+            "container": "openjdk:8-jre-alpine",
+            "entrypoint": "ash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Remote Port",
+            "description": "",
+            "env_variable": "RPORT",
+            "default_value": "25565",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Remote Auth",
+            "description": "The authentication method used for connecting to the remote server.\r\nAccepted values:\r\ncredentials   : This will display a form when you join the proxy asking you to enter your Mojang credentials\r\noffline       :  No authentication, cant join premium servers such as Hypixel",
+            "env_variable": "REMOTE_AUTH",
+            "default_value": "credentials",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "XBox Auth",
+            "description": "Whether or not Bedrock clients should be authenticated with xbox live\r\n\r\nTRUE or FALSE",
+            "env_variable": "XBOX_AUTH",
+            "default_value": "false",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Max Players",
+            "description": "The maximum amount of players that can join the proxy",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "1",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
\ No newline at end of file

From 0196f44d04eb0d16e02e59be7239c6edc37b5c56 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Mon, 20 Apr 2020 23:08:30 -0400
Subject: [PATCH 35/48] add red-discordbot

This adds the red discordbot
---
 bots/discord/redbot/config.json  |  9 +++++++
 bots/discord/redbot/egg-red.json | 45 ++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 bots/discord/redbot/config.json
 create mode 100644 bots/discord/redbot/egg-red.json

diff --git a/bots/discord/redbot/config.json b/bots/discord/redbot/config.json
new file mode 100644
index 00000000..86b5e0a0
--- /dev/null
+++ b/bots/discord/redbot/config.json
@@ -0,0 +1,9 @@
+{
+    "pterodactyl": {
+        "DATA_PATH": "/home/container/.local/share/Red-DiscordBot/data/pterodactyl",
+        "COG_PATH_APPEND": "cogs",
+        "CORE_PATH_APPEND": "core",
+        "STORAGE_TYPE": "JSON",
+        "STORAGE_DETAILS": {}
+    }
+}
\ No newline at end of file
diff --git a/bots/discord/redbot/egg-red.json b/bots/discord/redbot/egg-red.json
new file mode 100644
index 00000000..499dded3
--- /dev/null
+++ b/bots/discord/redbot/egg-red.json
@@ -0,0 +1,45 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-04-20T23:06:14-04:00",
+    "name": "Red",
+    "author": "parker@parkervcp.com",
+    "description": "A multifunction Discord bot \r\n\r\nhttps:\/\/github.com\/Cog-Creators\/Red-DiscordBot",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:bot_red",
+    "startup": "PATH=$PATH:\/home\/container\/.local\/bin redbot pterodactyl --token {{TOKEN}} --prefix {{PREFIX}}",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Invite URL:\"\r\n}",
+        "logs": "{}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# red-discordbot install script\r\n\r\n## install deps\r\nmkdir -p \/usr\/share\/man\/man1\r\napt update\r\napt -y install git ca-certificates dnsutils iproute2 make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev git openjdk-11-jre\r\n\r\n## config folder layouts\r\necho -e \"generating config folder layout\"\r\nmkdir -p \/mnt\/server\/.config\/{Red-DiscordBot,share}\/ \/mnt\/server\/.local\/share\/Red-DiscordBot\/data\/pterodactyl\/\r\ncd \/mnt\/server\/\r\nln -s .local\/share\/Red-DiscordBot\/data\/pterodactyl\/ .\/configs\r\n\r\n## install red\r\necho -e \"add container user to install\"\r\nln -s \/mnt\/server\/ \/home\/container\r\nuseradd -m -d \/home\/container container\r\nchown -R container \/mnt\/server\/\r\necho -e \"install red locally as user\"\r\nsu - container -c 'pip install -U Red-DiscordBot'\r\n\r\n## ensure the config is in place if it doesn't exist\r\nif [ ! -f \/mnt\/server\/.config\/Red-DiscordBot\/config.json ]; then\r\n    curl https:\/\/gist.githubusercontent.com\/parkervcp\/4a5a68aec5a26b35e4315b22dd6d6748\/raw\/a776b1610949dd242ff8ce5cdc8ad7d43e4f7dad\/config.json -o \/mnt\/server\/.config\/Red-DiscordBot\/config.json\r\nfi\r\n\r\necho -e \"install finished\"",
+            "container": "python:3.8-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Discord Bot Token",
+            "description": "Get your own token here - https:\/\/discordapp.com\/developers\/applications\/",
+            "env_variable": "TOKEN",
+            "default_value": "GET_YOUR_OWN",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string"
+        },
+        {
+            "name": "Command Prefix",
+            "description": "The prefix for commands from the bot.",
+            "env_variable": "PREFIX",
+            "default_value": ".",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string"
+        }
+    ]
+}
\ No newline at end of file

From 44e58a75a8740e9b867edc326eb17700f8f766b1 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Mon, 20 Apr 2020 23:18:25 -0400
Subject: [PATCH 36/48] add readme files

---
 README.md                     | 1 +
 bots/discord/redbot/README.md | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 bots/discord/redbot/README.md

diff --git a/README.md b/README.md
index b4ccfbee..b6e9c5e3 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [jmusicbot](/bots/discord/jmusicbot) Java
 * [parkertron](/bots/discord/parkertron/) Golang
 * [pixel-bot](/bots/discord/pixelbot/) Python
+* [Red](/bots/discord/redbot/) Python
 * [Sinusbot](/bots/discord/sinusbot/)
 
 [Twitch](/bots/twitch)
diff --git a/bots/discord/redbot/README.md b/bots/discord/redbot/README.md
new file mode 100644
index 00000000..d4f3c036
--- /dev/null
+++ b/bots/discord/redbot/README.md
@@ -0,0 +1,8 @@
+# Red-DiscordBot
+### From their [Github](https://github.com/Cog-Creators/Red-DiscordBot)
+A multifunction Discord bot 
+
+### Server Ports
+No port are required to run Red.
+
+#### Mods/Plugins may require ports to be added to the server.

From 42bc15fd1d155dcc8e7c11ce03c0351e054027d7 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Mon, 20 Apr 2020 23:43:23 -0400
Subject: [PATCH 37/48] fix conan

updates the conan desc
---
 steamcmd_servers/conan_exiles/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/steamcmd_servers/conan_exiles/README.md b/steamcmd_servers/conan_exiles/README.md
index 28d4024b..4ec44fe6 100644
--- a/steamcmd_servers/conan_exiles/README.md
+++ b/steamcmd_servers/conan_exiles/README.md
@@ -1,5 +1,5 @@
 ### From their [Site](https://conanexiles.com/)
-Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single- and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC’s premier military game. Authentic, diverse, open - Arma 3 sends you to war. 
+Conan Exiles is online multiplayer survival game set in the lands of Conan the Barbarian
 
 ### Minimum RAM warning
 This server requires about 4096m to run properly.

From 717149ee335ac84cfeb7af3097e6a6612b404272 Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Tue, 21 Apr 2020 09:36:31 +0200
Subject: [PATCH 38/48] New try. I hope it works now

---
 .../egg-citadel--forged-with-fire.json        | 63 -------------------
 .../citadel/egg-citadel-forged-with-fire.json | 54 ++++++++++++++++
 2 files changed, 54 insertions(+), 63 deletions(-)
 delete mode 100644 steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
 create mode 100644 steamcmd_servers/citadel/egg-citadel-forged-with-fire.json

diff --git a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json b/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
deleted file mode 100644
index 53dc9bc4..00000000
--- a/steamcmd_servers/citadel/egg-citadel--forged-with-fire.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
-    "meta": {
-        "version": "PTDL_v1"
-    },
-    "exported_at": "2020-04-20T08:58:00+02:00",
-    "name": "Citadel: Forged with Fire",
-    "author": "info@goover.de",
-    "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
-    "startup": ".\/CitadelServer.sh",
-    "config": {
-        "files": "{\r\n    \"Citadel\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"ConnectionPort=\": \"ConnectionPort={{server.build.env.CPORT}}\",\r\n            \"QueryPort=\": \"QueryPort={{server.build.default.port}}\",\r\n            \"Password=\": \"Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"WorldCreationSettings=\": \"WorldCreationSettings=({{server.build.env.WORLD_CREATION_SETTINGS}})\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Steam Server initialized and registered with UWorks\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
-        "stop": "^C"
-    },
-    "scripts": {
-        "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n# Create Game.ini\r\nrm -rf $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat <<EOT > $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\n[UWorks]\r\nConnectionPort=27015\r\nQueryPort=7777\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"My Private Server\",Password=\"\",ServerType=PVP,PlayerLimit=40,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)\r\nEOT\r\n\r\nchmod +x $HOME\/CitadelServer.sh",
-            "container": "debian:buster-slim",
-            "entrypoint": "bash"
-        }
-    },
-    "variables": [
-        {
-            "name": "Game ID",
-            "description": "ID",
-            "env_variable": "SRCDS_APPID",
-            "default_value": "489650",
-            "user_viewable": 1,
-            "user_editable": 0,
-            "rules": "required|numeric|digits_between:1,6"
-        },
-        {
-            "name": "Connection Port",
-            "description": "Query Port",
-            "env_variable": "CPORT",
-            "default_value": "7777",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|string|max:5"
-        },
-        {
-            "name": "Admin Password",
-            "description": "",
-            "env_variable": "ADMIN_PASSWD",
-            "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|string|max:20"
-        },
-        {
-            "name": "World Creation Settings",
-            "description": "Pls define SERVERNAME, PASSWORT to join Server, MAX PLAYERS and SERVER MODE !!!",
-            "env_variable": "WORLD_CREATION_SETTINGS",
-            "default_value": "WorldCreationSettings=(ServerName=\"My Private Server\",Password=\"\",ServerType=PVP,PlayerLimit=40,bPrivate=false,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000)",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json b/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json
new file mode 100644
index 00000000..d8f8e048
--- /dev/null
+++ b/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json
@@ -0,0 +1,54 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-04-21T09:35:15+02:00",
+    "name": "Citadel: Forged with Fire",
+    "author": "info@goover.de",
+    "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "startup": ".\/CitadelServer.sh",
+    "config": {
+        "files": "{\r\n    \"Config\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"ConnectionPort=\": \"ConnectionPort={{server.build.default.port}}\",\r\n            \"QueryPort=\": \"QueryPort={{server.build.env.QPORT}}\",\r\n            \"Password\": \"Password={{server.build.env.ADMIN_PASSWD}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Steam Server initialized and registered with UWorks\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n##Copy steamclient.so to correct Dir\r\nmkdir -p $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n## Create Game.ini\r\nmkdir $HOME\/Config\r\n\r\nif [[ -d $HOME\/Citadel\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nif [[ -d $HOME\/Engine\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Engine\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nmkdir -p $HOME\/Citadel\/Saved\/Config\r\nmkdir -p $HOME\/Engine\/Saved\/Config\r\n\r\nln -s ..\/..\/..\/Config $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nln -s ..\/..\/..\/Config $HOME\/Engine\/Saved\/Config\/LinuxServer\r\n\r\n#rm -fR $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat <<EOT > $HOME\/Config\/Game.ini\r\n[UWorks]\r\nConnectionPort=7777\r\nQueryPort=27015\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"CitadelServer\",Password=\"YourServerPassword\",ServerType=PVP,PlayerLimit=20,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000,StructureDecayMultiplier=2.000000,bThronesDecay=true)\r\nEOT\r\n\r\nchmod +x $HOME\/CitadelServer.sh",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Game ID",
+            "description": "ID",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "489650",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|numeric|digits_between:1,6"
+        },
+        {
+            "name": "Query Port",
+            "description": "port",
+            "env_variable": "QPORT",
+            "default_value": "27015",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:100"
+        },
+        {
+            "name": "Admin Password",
+            "description": "",
+            "env_variable": "ADMIN_PASSWD",
+            "default_value": "changeme",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:100"
+        }
+    ]
+}
\ No newline at end of file

From c0c5f975bd1451c86686f1e63f467348f8f6b141 Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Tue, 21 Apr 2020 09:41:35 +0200
Subject: [PATCH 39/48] Update Readme

---
 steamcmd_servers/citadel/README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/steamcmd_servers/citadel/README.md b/steamcmd_servers/citadel/README.md
index 38185635..e85ca5c1 100644
--- a/steamcmd_servers/citadel/README.md
+++ b/steamcmd_servers/citadel/README.md
@@ -7,3 +7,10 @@ Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical wo
 |-------|---------|
 | Game  | 7777    |
 | Query | 27015   |
+
+## Notes
+
+You need to setup the Config of the Server in
+/Config/Game.ini
+
+-> WorldCreationSettings

From a7b87da7aa2779474fab0f77311b8038dc247f71 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Tue, 21 Apr 2020 22:49:24 -0400
Subject: [PATCH 40/48] fix forge install

fixes the forge install
---
 minecraft_java/forge/forge/egg-forge-enhanced.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/minecraft_java/forge/forge/egg-forge-enhanced.json b/minecraft_java/forge/forge/egg-forge-enhanced.json
index b104b7ed..9695b009 100644
--- a/minecraft_java/forge/forge/egg-forge-enhanced.json
+++ b/minecraft_java/forge/forge/egg-forge-enhanced.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-16T20:29:22-04:00",
+    "exported_at": "2020-04-21T22:47:03-04:00",
     "name": "Forge Enhanced",
     "author": "parker@parkervcp.com",
     "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n    echo -e \"getting latest recommended version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage' | sed \"s\/http:\/https:\/g\")\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; then\r\n\techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n\texit 1\r\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n\r\n\r\nif [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\nelse\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n            if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-universal.jar; then\r\n            echo -e \"universal jar download link is valid.\"\r\n        else\r\n            echo -e \"link is invalid closing out\"\r\n            exit 3\r\n        fi\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\ncurl -s -o $SERVER_JARFILE -sS ${DOWNLOAD_LINK}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
+            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nSERVER_JARFILE=server.jar\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n    echo -e \"getting latest recommended version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage' | sed \"s\/http:\/https:\/g\")\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; then\r\n\techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n\texit 1\r\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\nif [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n    FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\nelse\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n    FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\n## move server jar to the correct place.\r\nmv $FORGE_JAR $SERVER_JARFILE\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
             "container": "openjdk:8-jdk-slim",
             "entrypoint": "bash"
         }

From f8d86036811e4f784ebeee24c3b623d801efcc98 Mon Sep 17 00:00:00 2001
From: Roman-Sangemino <60158230+Roman-Sangemino@users.noreply.github.com>
Date: Wed, 22 Apr 2020 11:51:16 -0400
Subject: [PATCH 41/48] Added Linux Bridge

---
 gta/ragemp/egg-rage--m-p.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json
index 4c9ea78a..289ffa89 100644
--- a/gta/ragemp/egg-rage--m-p.json
+++ b/gta/ragemp/egg-rage--m-p.json
@@ -3,10 +3,10 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2019-09-04T17:31:10-04:00",
-    "name": "Rage.MP",
+    "exported_at": "2020-04-22T09:18:34-04:00",
+    "name": "RAGE:MP Plug and Play",
     "author": "noreply.waypointhosting@gmail.com",
-    "description": "https:\/\/rage.mp\/\r\n\r\nThis server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.",
+    "description": "https:\/\/rage.mp\/\r\n\r\nModified to work with the latest version of RAGE:MP\r\nWill automatically install linux bridge.\r\n**This server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
     "startup": ".\/server",
     "config": {
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "apt update\r\napt -y install curl tar\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o ragemp-srv.tar.gz https:\/\/cdn.rage.mp\/lin\/ragemp-srv.tar.gz\r\n\r\ntar -xzvf ragemp-srv.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm ragemp-srv.tar.gz\r\n\r\nchmod +x .\/server\r\n\r\nif [ -e conf.json ]; then\r\n    echo \"server config file exists\"\r\nelse\r\n    echo \"Downloading default rage.mp config\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/RageMP\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0",
+            "script": "apt update\r\napt -y install curl tar\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o ragemp-srv-037.tar.gz https:\/\/cdn.rage.mp\/lin\/ragemp-srv-037.tar.gz\r\ncurl -sSL -o bridge-linux-037.tar.gz https:\/\/cdn.rage.mp\/lin\/bridge-linux-037.tar.gz\r\n\r\ntar -xzvf ragemp-srv-037.tar.gz --strip 1 -C \/mnt\/server\r\ntar -xzvf bridge-linux-037.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm ragemp-srv-037.tar.gz\r\nrm bridge-linux-037.tar.gz\r\n\r\nchmod +x .\/server\r\n\r\nif [ -e conf.json ]; then\r\n    echo \"server config file exists\"\r\nelse\r\n    echo \"Downloading default rage.mp config\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/gta\/ragemp\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0",
             "container": "debian:stable-slim",
             "entrypoint": "bash"
         }
@@ -51,4 +51,4 @@
             "rules": "required|boolean"
         }
     ]
-}
\ No newline at end of file
+}

From d3ad66d58901fe96e135e3040cbcb59262c8937f Mon Sep 17 00:00:00 2001
From: Roman-Sangemino <60158230+Roman-Sangemino@users.noreply.github.com>
Date: Wed, 22 Apr 2020 11:57:26 -0400
Subject: [PATCH 42/48] Update egg-rage--m-p.json

---
 gta/ragemp/egg-rage--m-p.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json
index 289ffa89..6ce7769b 100644
--- a/gta/ragemp/egg-rage--m-p.json
+++ b/gta/ragemp/egg-rage--m-p.json
@@ -4,7 +4,7 @@
         "version": "PTDL_v1"
     },
     "exported_at": "2020-04-22T09:18:34-04:00",
-    "name": "RAGE:MP Plug and Play",
+    "name": "Rage.MP",
     "author": "noreply.waypointhosting@gmail.com",
     "description": "https:\/\/rage.mp\/\r\n\r\nModified to work with the latest version of RAGE:MP\r\nWill automatically install linux bridge.\r\n**This server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",

From 67af14221db609e3d887db4279f9310e7393c114 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Wed, 22 Apr 2020 19:50:27 -0400
Subject: [PATCH 43/48] Update forge installer

Updating forge installer again
---
 minecraft_java/forge/forge/egg-forge-enhanced.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/minecraft_java/forge/forge/egg-forge-enhanced.json b/minecraft_java/forge/forge/egg-forge-enhanced.json
index 9695b009..73e8fca0 100644
--- a/minecraft_java/forge/forge/egg-forge-enhanced.json
+++ b/minecraft_java/forge/forge/egg-forge-enhanced.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-21T22:47:03-04:00",
+    "exported_at": "2020-04-22T19:49:57-04:00",
     "name": "Forge Enhanced",
     "author": "parker@parkervcp.com",
     "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nSERVER_JARFILE=server.jar\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n    echo -e \"getting latest recommended version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage' | sed \"s\/http:\/https:\/g\")\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; then\r\n\techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n\texit 1\r\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\nif [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n    FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\nelse\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n    FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\n## move server jar to the correct place.\r\nmv $FORGE_JAR $SERVER_JARFILE\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
+            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n    echo -e \"getting latest recommended version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n\tBUILD_TYPE=recommended\r\nfi\r\n\r\nif [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n    BUILD_TYPE=recommended\r\nfi\r\n\r\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage' | sed \"s\/http:\/https:\/g\")\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"recommended\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n\techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n\texit 1\r\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\nif [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n    FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n    if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n        FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n    fi\r\nelse\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n    FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\nmv $FORGE_JAR $SERVER_JARFILE\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
             "container": "openjdk:8-jdk-slim",
             "entrypoint": "bash"
         }

From 1ce06a18ea21f1d4333c3fdef2f1bbea76d3430f Mon Sep 17 00:00:00 2001
From: lucatunes <61157271+lucatunes@users.noreply.github.com>
Date: Thu, 23 Apr 2020 00:40:19 -0500
Subject: [PATCH 44/48] Fixed the musicbot title

---
 bots/discord/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bots/discord/README.md b/bots/discord/README.md
index 66ab5d3b..32e7f28b 100644
--- a/bots/discord/README.md
+++ b/bots/discord/README.md
@@ -18,7 +18,7 @@ Give awesome perks to your Discord server!
 [discord.js](https://discord.js.org/)  
 A generic discord.js egg for running discord bots.
 
-#### fragbot
+#### MusicBot
 [jagrosh/MusicBot](https://github.com/jagrosh/MusicBot)  
 A Discord music bot that's easy to set up and run yourself!  
 
@@ -37,4 +37,4 @@ Was used to test python services.
 
 #### SinusBot
 [SinusBot](https://www.sinusbot.com/)  
-Please Check their site for an in depth on the bot.
\ No newline at end of file
+Please Check their site for an in depth on the bot.

From 5686a22941249e5c9f512b1620a17c8e71e8451c Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Fri, 24 Apr 2020 11:38:25 +0200
Subject: [PATCH 45/48] Added Soldat Server

---
 README.md                               |  1 +
 steamcmd_servers/README.md              |  3 ++
 steamcmd_servers/soldat/README.md       |  9 ++++
 steamcmd_servers/soldat/egg-soldat.json | 72 +++++++++++++++++++++++++
 4 files changed, 85 insertions(+)
 create mode 100644 steamcmd_servers/soldat/README.md
 create mode 100644 steamcmd_servers/soldat/egg-soldat.json

diff --git a/README.md b/README.md
index f9eabdf9..015e365d 100644
--- a/README.md
+++ b/README.md
@@ -109,6 +109,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [PixARK](/steamcmd_servers/pixark/)
 * [Rust Staging Branch](/steamcmd_servers/rust_staging/)
 * [SCP: Secret Laboratory](/steamcmd_servers/scpsl/)
+* [SSoldat](/steamcmd_servers/soldat/)
 * [Starbound](/steamcmd_servers/starbound)
 * [Stationeers](/steamcmd_servers/Stationeers/)
 * [Sven Co-op](/steamcmd_servers/svencoop)
diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md
index 7a749b9d..13714993 100644
--- a/steamcmd_servers/README.md
+++ b/steamcmd_servers/README.md
@@ -43,6 +43,9 @@ This is a collection of servers that use steamcmd to install.
 ## SCP: Secret Laboratory
 [SCP: Secret Laboratory](/scpsl/)
 
+## Soldat
+[soldat](soldat/)
+
 ## Squad
 [squad](squad/)
 
diff --git a/steamcmd_servers/soldat/README.md b/steamcmd_servers/soldat/README.md
new file mode 100644
index 00000000..d1fc670e
--- /dev/null
+++ b/steamcmd_servers/soldat/README.md
@@ -0,0 +1,9 @@
+# Soldat
+Soldat is a unique 2D (side-view) multiplayer action game. It has been influenced by the best of games such as Liero, Worms, Quake, and Counter-Strike and provides a fast-paced gaming experience with tons of blood and flesh. Soldiers fight against each other in 2D battle arenas using a deadly arsenal of military weapons, across 7 default game modes. It features 18 different weapons and 60 maps to frag away on, with full support for user created content.
+
+## Server Ports
+
+| Port  | default |
+|-------|---------|
+| Game  | 23073   |
+| Query | 23083   |
diff --git a/steamcmd_servers/soldat/egg-soldat.json b/steamcmd_servers/soldat/egg-soldat.json
new file mode 100644
index 00000000..d5a57cd2
--- /dev/null
+++ b/steamcmd_servers/soldat/egg-soldat.json
@@ -0,0 +1,72 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2020-04-24T11:32:12+02:00",
+    "name": "Soldat",
+    "author": "info@goover.de",
+    "description": "Soldat is a unique 2D (side-view) multiplayer action game. It has been influenced by the best of games such as Liero, Worms, Quake, and Counter-Strike and provides a fast-paced gaming experience with tons of blood and flesh. Soldiers fight against each other in 2D battle arenas using a deadly arsenal of military weapons, across 7 default game modes. It features 18 different weapons and 60 maps to frag away on, with full support for user created content.\r\n\r\nSteam: https:\/\/store.steampowered.com\/app\/638490\/Soldat\/",
+    "image": "quay.io\/goover\/debian_base:base_debian",
+    "startup": ".\/soldatserver",
+    "config": {
+        "files": "{\r\n    \"soldat.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"Port=\": \"Port={{server.build.default.port}}\",\r\n            \"Max_Players=\": \"Max_Players={{server.build.env.MAX_PLAYERS}}\",\r\n            \"Game_Password=\": \"Game_Password={{server.build.env.SRV_PWD}}\",\r\n            \"Admin_Password=\": \"Admin_Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"Server_Name=\": \"Server_Name={{server.build.env.SRV_NAME}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Done\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\ndpkg --add-architecture i386\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates libstdc++6 lib32stdc++6 util-linux\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\ncd \/mnt\/server\r\nchmod +x soldatserver",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Admin Passwort",
+            "description": "Admin Password for the Server",
+            "env_variable": "ADMIN_PASSWD",
+            "default_value": "changeme",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Server Password",
+            "description": "Password to join Server",
+            "env_variable": "SRV_PWD",
+            "default_value": "chageme",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Server Name",
+            "description": "Name of the Server",
+            "env_variable": "SRV_NAME",
+            "default_value": "MySoldatServer",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:100"
+        },
+        {
+            "name": "Max Players",
+            "description": "Max Players can join",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "10",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "ADD IP",
+            "description": "Steam APP ID",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "638500",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
\ No newline at end of file

From 94c00a651a42943cf7f2f1675b949ec7b89f733a Mon Sep 17 00:00:00 2001
From: gOOvER <info@goover.de>
Date: Fri, 24 Apr 2020 16:04:41 +0200
Subject: [PATCH 46/48] Update egg-soldat.json

---
 steamcmd_servers/soldat/egg-soldat.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/steamcmd_servers/soldat/egg-soldat.json b/steamcmd_servers/soldat/egg-soldat.json
index d5a57cd2..b9b60fae 100644
--- a/steamcmd_servers/soldat/egg-soldat.json
+++ b/steamcmd_servers/soldat/egg-soldat.json
@@ -3,11 +3,11 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-24T11:32:12+02:00",
+    "exported_at": "2020-04-24T16:03:28+02:00",
     "name": "Soldat",
     "author": "info@goover.de",
     "description": "Soldat is a unique 2D (side-view) multiplayer action game. It has been influenced by the best of games such as Liero, Worms, Quake, and Counter-Strike and provides a fast-paced gaming experience with tons of blood and flesh. Soldiers fight against each other in 2D battle arenas using a deadly arsenal of military weapons, across 7 default game modes. It features 18 different weapons and 60 maps to frag away on, with full support for user created content.\r\n\r\nSteam: https:\/\/store.steampowered.com\/app\/638490\/Soldat\/",
-    "image": "quay.io\/goover\/debian_base:base_debian",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
     "startup": ".\/soldatserver",
     "config": {
         "files": "{\r\n    \"soldat.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"Port=\": \"Port={{server.build.default.port}}\",\r\n            \"Max_Players=\": \"Max_Players={{server.build.env.MAX_PLAYERS}}\",\r\n            \"Game_Password=\": \"Game_Password={{server.build.env.SRV_PWD}}\",\r\n            \"Admin_Password=\": \"Admin_Password={{server.build.env.ADMIN_PASSWD}}\",\r\n            \"Server_Name=\": \"Server_Name={{server.build.env.SRV_NAME}}\"\r\n        }\r\n    }\r\n}",

From 7e1c7325767868397e989fbfbd816a65739e857d Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sat, 25 Apr 2020 10:41:37 -0400
Subject: [PATCH 47/48] fix install script

adds a missing -y I had in my copy.
---
 bots/discord/corpbot/egg-corp-bot.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bots/discord/corpbot/egg-corp-bot.json b/bots/discord/corpbot/egg-corp-bot.json
index 1561ca58..f7e46d52 100644
--- a/bots/discord/corpbot/egg-corp-bot.json
+++ b/bots/discord/corpbot/egg-corp-bot.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-04-18T15:36:40-04:00",
+    "exported_at": "2020-04-25T10:31:48-04:00",
     "name": "CorpBot",
     "author": "parker@parkervcp.com",
     "description": "A very clumsy python bot for discord \r\n\r\nhttps:\/\/github.com\/corpnewt\/CorpBot.py",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# CoprBot Install Script\r\n#\r\n## create dir is it doesn't exist\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n    mkdir \/mnt\/server\/\r\nfi\r\n\r\n## move to directory\r\ncd \/mnt\/server\/\r\n\r\n## install deps\r\napt update\r\napt install git gcc\r\n\r\n## git clone \r\ngit clone https:\/\/github.com\/corpnewt\/CorpBot.py.git .\r\n\r\n## Modify Install.py to work properly in egg format\r\nmv Install.py Install.py.orig\r\nsed -n '\/press enter to exit\/q;p' Install.py.orig > Install.py\r\nsed -i 's\/\"-U\"\/\"-U\", \"--target\", \"\\\/mnt\\\/server\\\/\"\/g' Install.py\r\n\r\n## run Install.py script\r\npython Install.py\r\n\r\n## get config during install\r\nif [ ! -f \/mnt\/server\/settings_dict.json ]; then\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/corpbot\/settings_dict.json -o settings_dict.json\r\nfi",
+            "script": "#!\/bin\/bash\r\n# CoprBot Install Script\r\n#\r\n## create dir is it doesn't exist\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n    mkdir \/mnt\/server\/\r\nfi\r\n\r\n## move to directory\r\ncd \/mnt\/server\/\r\n\r\n## install deps\r\napt update\r\napt install -y git gcc curl\r\n\r\n## git clone \r\ngit clone https:\/\/github.com\/corpnewt\/CorpBot.py.git .\r\n\r\n## Modify Install.py to work properly in egg format\r\nmv Install.py Install.py.orig\r\nsed -n '\/press enter to exit\/q;p' Install.py.orig > Install.py\r\nsed -i 's\/\"-U\"\/\"-U\", \"--target\", \"\\\/mnt\\\/server\\\/\"\/g' Install.py\r\n\r\n## run Install.py script\r\npython Install.py\r\n\r\n## get config during install\r\nif [ ! -f \/mnt\/server\/settings_dict.json ]; then\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/corpbot\/settings_dict.json -o settings_dict.json\r\nfi",
             "container": "python:3.8-slim",
             "entrypoint": "bash"
         }

From 1be7a4beba6b9dd0f5437adce5fe81f249d9a007 Mon Sep 17 00:00:00 2001
From: Michael Parker <parkervcp@gmail.com>
Date: Sat, 25 Apr 2020 18:21:38 -0400
Subject: [PATCH 48/48] reorganize scp folder

moves the scp servers into an scp folder in steamcmd
---
 README.md                                     |  2 ++
 steamcmd_servers/scpsl/README.md              | 30 +++++++++++++++++++
 .../dedicated}/README.md                      |  0
 .../dedicated}/egg-scpsl.json                 |  0
 .../multiadmin}/README.md                     |  2 +-
 .../multiadmin}/egg-scpsl.json                |  0
 6 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 steamcmd_servers/scpsl/README.md
 rename steamcmd_servers/{scpsl-dedicated => scpsl/dedicated}/README.md (100%)
 rename steamcmd_servers/{scpsl-dedicated => scpsl/dedicated}/egg-scpsl.json (100%)
 rename steamcmd_servers/{scpsl-multiadmin => scpsl/multiadmin}/README.md (97%)
 rename steamcmd_servers/{scpsl-multiadmin => scpsl/multiadmin}/egg-scpsl.json (100%)

diff --git a/README.md b/README.md
index 211b6b03..2591404d 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,8 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [PixARK](/steamcmd_servers/pixark/)
 * [Rust Staging Branch](/steamcmd_servers/rust_staging/)
 * [SCP: Secret Laboratory](/steamcmd_servers/scpsl/)
+  * [dedicated](/steamcmd_servers/scpsl/dedicated/)
+  * [multiadmin](/steamcmd_servers/scpsl/multiadmin/)
 * [SSoldat](/steamcmd_servers/soldat/)
 * [Starbound](/steamcmd_servers/starbound)
 * [Stationeers](/steamcmd_servers/Stationeers/)
diff --git a/steamcmd_servers/scpsl/README.md b/steamcmd_servers/scpsl/README.md
new file mode 100644
index 00000000..33b220b1
--- /dev/null
+++ b/steamcmd_servers/scpsl/README.md
@@ -0,0 +1,30 @@
+## SCP: Secret Laboratory
+
+### [dedicated](dedicated/)
+SCP: Secret Laboratory Dedicated Linux Server AddID: [996560](https://steamdb.info/app/996560/)
+This Server is NOT compatible with ServerMod2 or MultiAdmin
+
+### [MultiAdmin](multiadmin)
+SCP: Secret Laboratory Pterodactyl egg. Works with MP2. Steam AppID: [996560](https://steamdb.info/app/996560/)
+This server is **NOT** compatible with SMod2 due to it not being updated for MP2.
+This server is **NOT** compatible with LocalAdmin due to server input causing it to crash. MultiAdmin with a config option is used instead.
+
+### Minimum RAM
+Minimum memory required to run the server: 3096 MB
+
+### Server Port
+Default port required to run the server.
+
+| Port    | Default |
+|---------|---------|
+| Game    | 7777    |
+
+### Verification
+
+The server must be verified with the SCP:SL developers in order for it to be visible in the server browser.
+
+Instructions are as follows:
+* Make sure your server complies with the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf).
+* Send an email to `server.verification@scpslgame.com` from your configured contact email with the following information:
+  1. The **public** IPv4 address of your server, with port. e.g. `69.69.69.69:7777`
+  2. If the server's IP is static or dynamic.
diff --git a/steamcmd_servers/scpsl-dedicated/README.md b/steamcmd_servers/scpsl/dedicated/README.md
similarity index 100%
rename from steamcmd_servers/scpsl-dedicated/README.md
rename to steamcmd_servers/scpsl/dedicated/README.md
diff --git a/steamcmd_servers/scpsl-dedicated/egg-scpsl.json b/steamcmd_servers/scpsl/dedicated/egg-scpsl.json
similarity index 100%
rename from steamcmd_servers/scpsl-dedicated/egg-scpsl.json
rename to steamcmd_servers/scpsl/dedicated/egg-scpsl.json
diff --git a/steamcmd_servers/scpsl-multiadmin/README.md b/steamcmd_servers/scpsl/multiadmin/README.md
similarity index 97%
rename from steamcmd_servers/scpsl-multiadmin/README.md
rename to steamcmd_servers/scpsl/multiadmin/README.md
index f5529fb9..52e05da4 100644
--- a/steamcmd_servers/scpsl-multiadmin/README.md
+++ b/steamcmd_servers/scpsl/multiadmin/README.md
@@ -15,7 +15,7 @@ Default port required to run the server.
 
 | Port    | Default |
 |---------|---------|
-| Game    | 7777   |
+| Game    | 7777    |
 
 
 ### Verification
diff --git a/steamcmd_servers/scpsl-multiadmin/egg-scpsl.json b/steamcmd_servers/scpsl/multiadmin/egg-scpsl.json
similarity index 100%
rename from steamcmd_servers/scpsl-multiadmin/egg-scpsl.json
rename to steamcmd_servers/scpsl/multiadmin/egg-scpsl.json