Merge remote-tracking branch 'upstream/master'

sync with upstream

.github/ISSUE_TEMPLATE/bugs.md

@@ -5,7 +5,9 @@ about: Report an issue for an egg
 ---
 
 Please fill out the information bellow and remove from the line up
+If you just submit a bug with no info I will close out your bug.
 ---------------
+
 Panel Version: (version number)
 Daemon Version: (version number)
 Service: (minecraft/factorio/etc)

.github/ISSUE_TEMPLATE/issue_template.md

@@ -1,15 +0,0 @@
-Please fill out the information bellow and remove from the line up
----------------
-Panel Version: (version number)
-Daemon Version: (version number)
-New Service: (yes/no) (Is this a request for a new service?)
-Service: (minecraft/factorio/etc)
-Modified: (yes/no) (did you add or change things, this includes startup configs/install scripts/variables)
-
-Expected Behavior:
-
-Actual Behavior:
-
-Steps to Reproduce: (Step by step what to do to cause the issue)
-
-If this is a request for a new service then you can add info here like links to the site where the server files can be found. If it is a steamcmd game have you looked at the custom source engine service yet?

.github/ISSUE_TEMPLATE/request.md

@@ -5,7 +5,9 @@ about: Suggest a server to build an egg for
 ---
 
 Please fill out the information bellow and remove from the line up
+Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server)
 ---------------
+
 Service: (Ex. minecraft/factorio/etc)
 
 Does this expand an already existing service: Y/N

.github/pull_request_template.md

@@ -2,6 +2,8 @@
 
 * [ ] Have you followed the guidelines in our Contributing document?
 * [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change?
+* [ ] Did you branch your changes and PR from that branch and not from your master branch?
+  * If not, why?:
 
 <!-- You can erase any parts of this template not applicable to your Pull Request. -->
 

CONTRIBUTING.md

@@ -11,6 +11,9 @@
 3. Try to stay in the stock containers.  
     If you need something in a container PR it to [my image repo](https://github.com/parkervcp/images) where I can review and pull up to the main repo.
 
+4. Don't be afraid to submit PR's to the egg repo.  
+    I dont bite. I will work with you on the egg and the required things to run it.
+
 ## Step 1.
 #### Be aware of the pterodactyl install process.
 
@@ -38,6 +41,6 @@ This is to maintain a clean repo that others can pull and be fully aware of what
 
 
 ## Step 3.
-#### Don't be afraid to submit PR's to the egg repo.
+#### Make a branch and do your work in there.
 
-I dont bite. I will work with you on the egg and the required things to run it.
+I have been getting messy PR's due to people always PRing from their master branch. Please make a branch and PR from there,

README.md

@@ -2,7 +2,7 @@
 
 I am working on adding a large collection of public eggs for the Pterodactyl community.
 
-With that I am also accepting PR's for new service and also updates to the current ones.
+With that I am also accepting PR's for new services and also updates to the current ones.
 
 If you are submitting PR's try and keep names and titles the same.
 
@@ -27,12 +27,16 @@ If you are reading this it looks like you are looking to add an egg to your serv
 ## Bot Eggs
 
 [Discord](/bots/discord/)   
-* [ATL Bot](/bots/discord/atlbot/) Node JS  
+* [ATL Bot](/bots/discord/atlbot/) Node JS
+* [Bastion](/bots/discord/bastion/)  
+* [discord.js](bots/discord/discord.js/) Node JS generic  
+* [fragbot](/bots/discord/fragbot/) Golang  
 * [parkertron](/bots/discord/parkertron/) Golang  
 * [pixel-bot](/bots/discord/pixelbot/) Python  
-* [discord.js](bots/discord/discord.js/) discord.js  
 * [Sinusbot](/bots/discord/sinusbot/)  
-* [Bastion](/bots/discord/bastion/)
+
+[TeamSpeak3](bots/teamspeak3)
+* [JTS3ServerMod](/bots/teamspeak3/jts3servermod/)
 
 ## Game Eggs
 
@@ -44,14 +48,22 @@ If you are reading this it looks like you are looking to add an egg to your serv
 
 [Don't Starve](/dont_starve/dont_starve)
 
-[ET: Legacy](/etlegacy/etlegacy/)
+[ET Legacy](/enemy_territory/etlegacy/)
 
 [Factorio](/factorio/factorio/)  
 
 [Grand Theft Auto](/gta/)  
-* [FiveM](/gta/fivem/)  
-* [RageMP](/gta/ragemp/)  
-* [Multi Theft Auto](/gta/mtasa/)
+* GTA V
+  * [FiveM](/gta/fivem/)  
+  * [RageMP](/gta/ragemp/)  
+* GTA SA
+  * [Multi Theft Auto](/gta/mtasa/)
+  * [SA-MP](/gta/samp/)
+
+[Minecraft Bedrock](/minecraft_bedrock/)  
+* [Bedrock](/minecraft_bedrock/bedrock/)  
+* [Nukkit](/minecraft_bedrock/nukkit/)  
+* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/)  
 
 [Minecraft Java](/minecraft_java/)
 * [Forge](/minecraft_java/forge/)  
@@ -60,30 +72,25 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [PaperSpigot (Legacy)](/minecraft_java/spigot/paper-legacy)
 * [Technic](/minecraft_java/technic/)  
 
-[Minecraft Bedrock](/minecraft_bedrock/)  
-* [Bedrock](/minecraft_bedrock/bedrock/)  
-* [Nukkit](/minecraft_bedrock/nukkit/)  
-* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/)  
-
-[Minecraft Proxies](/minecraft_proxy/)  
+[Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft)  
 * [Waterfall](/minecraft_proxy/waterfall/)  
 
 [Mount & Blade Warband](/mb_warband/)
 
-
 [OpenTTD](/openttd/)
 
 [Source](/source_servers/)  These eggs use steamcmd to install  
 * [7 Days to Die](/source_servers/7_days_to_die/)  
+* [ARK Survival Evolved](/source_servers/ark_survival_evolved/)
 * [PixARK](/source_servers/pixark/)  
 * [Rust Staging Branch](/source_servers/rust-staging/)
 * [Starbound](/source_servers/starbound)
 
+[Squad](/squad/)  
+
 [Unreal Engine](/unreal_engine)
 * [Tower Unit](/unreal_engine/tower_unit/)
 
-[Squad](/squad/)  
-
 [Terraria](/terraria/)  
 * [tmodloader](/terraria/tmodloader)  
 * [tshock](/terraria/tshock/)  

bots/discord/README.md

@@ -14,6 +14,14 @@ Their github has all the info you need
 [TheBastionBot/Bastion](https://github.com/TheBastionBot/Bastion)  
 Give awesome perks to your Discord server!
 
+#### DiscordJS
+[discord.js](https://discord.js.org/)  
+A generic discord.js egg for running discord bots.
+
+#### fragbot
+[fragforce/fragbot](https://github.com/fragforce/fragbot)  
+The bot that runs as the fragforce `@Fragbot` offering looking-for-group services for now  
+
 #### parkertron
 [parkervcp/parkertron](https://github.com/parkervcp/parkertron)  
 The bot that runs as the pterodactyl `@Support Bot`  

bots/discord/discord.js/README.md

@@ -2,4 +2,6 @@
 
 This egg was designed to allow a user to pull their own nodejs discord bot from a repo.
 
-There is an option to allow a user to upload their own files to run a bot.
+There is an option to allow a user to upload their own files to run a bot.
+
+The startup configs and commands may need changing to actually function properly.

bots/discord/fragbot/README.md

@@ -5,4 +5,4 @@ The golang based discord bot for fragforce.
 Runs the fragforce `@fragbot`
 
 ### Server Ports
-There are no ports required for parkertron
+There are no ports required for fragbot

bots/teamspeak3/README.md

@@ -0,0 +1,7 @@
+# TeamSpeak3 Bots
+
+### Some of these bots support other services but are primarily TeamSpeak3 bots
+
+#### JTS3ServerMod
+[JTS3ServerMod](https://www.stefan1200.de/forum/index.php?topic=2.0)  
+Please Check their site for an in depth on the bot.

bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json

@@ -0,0 +1,36 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2019-01-11T00:40:33+01:00",
+    "name": "JTS3ServerMod",
+    "author": "teamwuffy@gmail.com",
+    "description": "Setup:\r\n- Install the latest version\r\n- Go into config\/server1 and edit JTS3ServerMod_server.cfg\r\n- Save and start the server\r\n\r\nAuthor: https:\/\/www.stefan1200.de\/forum\/index.php?topic=2.0",
+    "image": "quay.io\/pterodactyl\/core:java",
+    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar .\/JTS3ServerMod.jar",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Successful connected to \",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# JTS3ServerMod\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y install wget unzip\r\n\r\ncd \/tmp\r\n\r\nif [ -z \"$SERVER_VERSION\" ] || [ \"$SERVER_VERSION\" == \"latest\" ]; then\r\n  wget -q -O JTS3ServerMod.zip 'https:\/\/www.stefan1200.de\/dlrequest.php?file=jts3servermod&type=.zip'\r\nelse\r\n  wget -q -O JTS3ServerMod.zip 'https:\/\/www.stefan1200.de\/downloads\/JTS3ServerMod_$SERVER_VERSION.zip'\r\nfi\r\n\r\nunzip JTS3ServerMod.zip\r\n\r\nmkdir -p \/mnt\/server\r\nexport HOME=\/mnt\/server\r\n\r\nmv \/tmp\/JTS3ServerMod\/* \/mnt\/server\/",
+            "container": "ubuntu:18.10",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Version",
+            "description": "",
+            "env_variable": "SERVER_VERSION",
+            "default_value": "latest",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        }
+    ]
+} 

enemy_territory/etlegacy/README.md

@@ -0,0 +1,20 @@
+# ET: Legacy
+
+#### The ET: Legacy Server
+
+
+#### from the developers
+
+Wolfenstein: Enemy Territory is a free multiplayer first-person shooter. Set during World War II and heavily focused on team work, it was initially released in 2003 by Splash Damage and id Software. More than a decade after its release, after spending countless hours of escorting tanks and trucks, stealing gold and radar parts
+and transmitting confidential documents, it was time to dust off the game which consistently refused to go down.
+
+Enemy Territory: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of GPLv3 license. The main goal of this project is to fix bugs, remove old dependencies and make it playable on all major operating systems while still remaining compatible with the ET 2.60b version and as many of its mods as possible. We do appreciate any contribution to the project such as patches, suggestions or comments. 
+
+Make sure to checkout their [Home Page]([https://factorio.com/starter-page](https://www.etlegacy.com/)).
+
+### Server Ports
+ET: Legacy requires a single port  
+
+| Port    | default |
+|---------|---------|
+| Game    | 27960   |

enemy_territory/etlegacy/egg-e-t-legacy.json

@@ -0,0 +1,45 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2019-04-29T22:08:18+08:00",
+    "name": "ET Legacy",
+    "author": "parker@parkervcp.com",
+    "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source",
+    "startup": ".\/etlded +set net_port {{SERVER_PORT}} +map {{MAP}}",
+    "config": {
+        "files": "{\r\n    \"etmain\/etl_server.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n            \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"------ Server Initialization ------\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{}",
+        "stop": "quit"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n    wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi '<a [^>]+>' |  grep -Eo 'href=\"[^\\\"]+\"' |  grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n    wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi '<a [^>]+>' |  grep -Eo 'href=\"[^\\\"]+\"' |  grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi '<a [^>]+>' |  grep -Eo 'href=\"[^\\\"]+\"' |  grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy",
+            "container": "ubuntu:18.04",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "ET Legacy Version",
+            "description": "What version of the server to install. 32 or 64 bit version.",
+            "env_variable": "ET_VERSION",
+            "default_value": "32",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|integer|in:32, 64"
+        },
+        {
+            "name": "Default Map",
+            "description": "The default map to use when starting the server.",
+            "env_variable": "MAP",
+            "default_value": "oasis",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        }
+    ]
+}

etlegacy/etlegacy/README.md

@@ -0,0 +1,20 @@
+# ET: Legacy
+
+#### The ET: Legacy Server
+
+
+#### from the developers
+
+Wolfenstein: Enemy Territory is a free multiplayer first-person shooter. Set during World War II and heavily focused on team work, it was initially released in 2003 by Splash Damage and id Software. More than a decade after its release, after spending countless hours of escorting tanks and trucks, stealing gold and radar parts
+and transmitting confidential documents, it was time to dust off the game which consistently refused to go own.
+
+Enemy Territory: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of GPLv3 license. The main goal of this project is to fix bugs, remove old dependencies and make it playable on all major operating systems while still remaining compatible with the ET 2.60b version and as many of its mods as possible. We do appreciate any contribution to the project such as patches, suggestions or comments. 
+
+Make sure to checkout their [Home Page]([https://factorio.com/starter-page](https://www.etlegacy.com/)).
+
+### Server Ports
+ET: Legacy requires a single port  
+
+| Port    | default |
+|---------|---------|
+| Game    | 27960   |

etlegacy/etlegacy/egg-e-t-legacy.json

@@ -0,0 +1,45 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2019-04-29T22:08:18+08:00",
+    "name": "ET Legacy",
+    "author": "parker@parkervcp.com",
+    "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source",
+    "startup": ".\/etlded +set net_port {{SERVER_PORT}} +map {{MAP}}",
+    "config": {
+        "files": "{\r\n    \"etmain\/etl_server.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n            \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"------ Server Initialization ------\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{}",
+        "stop": "quit"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n    wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi '<a [^>]+>' |  grep -Eo 'href=\"[^\\\"]+\"' |  grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n    wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi '<a [^>]+>' |  grep -Eo 'href=\"[^\\\"]+\"' |  grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi '<a [^>]+>' |  grep -Eo 'href=\"[^\\\"]+\"' |  grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy",
+            "container": "ubuntu:18.04",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "ET Legacy Version",
+            "description": "What version of the server to install. 32 or 64 bit version.",
+            "env_variable": "ET_VERSION",
+            "default_value": "32",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|integer|in:32, 64"
+        },
+        {
+            "name": "Default Map",
+            "description": "The default map to use when starting the server.",
+            "env_variable": "MAP",
+            "default_value": "oasis",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:20"
+        }
+    ]
+}