From 65cddbc8afc6c79a09691adbd3324e185de1307e Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 11 Jan 2019 17:37:42 +0100 Subject: [PATCH 01/11] Added JTS3ServerMod --- README.md | 3 ++ bots/teamspeak3/README.md | 7 ++++ .../jts3servermod/egg-j-t-s3-server-mod.json | 36 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 bots/teamspeak3/README.md create mode 100644 bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json diff --git a/README.md b/README.md index e01851f0..83cb19bf 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,9 @@ If you are submitting PR's try and keep names and titles the same. * [pixel-bot](/bots/discord/pixelbot/) Python * [Sinusbot](/bots/discord/sinusbot/) +[TeamSpeak3](bots/teamspeak3) +* [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) + ## Game Eggs [Arma](/arma/) diff --git a/bots/teamspeak3/README.md b/bots/teamspeak3/README.md new file mode 100644 index 00000000..f430ca9f --- /dev/null +++ b/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. \ No newline at end of file diff --git a/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json b/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json new file mode 100644 index 00000000..c6094ad2 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file From 1abcbd1f82c5bf0b5565f05dadf036673475dc5e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 11 Mar 2019 06:47:12 -0400 Subject: [PATCH 02/11] Add ET Legacy --- README.md | 1 - etlegacy/etlegacy/README.md | 20 +++++++++++++++ etlegacy/etlegacy/egg-e-t-legacy.json | 36 +++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 etlegacy/etlegacy/README.md create mode 100644 etlegacy/etlegacy/egg-e-t-legacy.json diff --git a/README.md b/README.md index 0841502c..ee415429 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,6 @@ If you submit a PR without filling out the template I will deny it. This is for [Mount & Blade Warband](/mb_warband/) - [OpenTTD](/openttd/) [Source](/source_servers/) These eggs use steamcmd to install diff --git a/etlegacy/etlegacy/README.md b/etlegacy/etlegacy/README.md new file mode 100644 index 00000000..38a65ea8 --- /dev/null +++ b/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 | \ No newline at end of file diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json new file mode 100644 index 00000000..2c3fec2d --- /dev/null +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-11T06:46:01-04: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}}", + "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": "{}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/mnt\/server\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 ']+>' | 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 ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "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" + } + ] +} \ No newline at end of file From 8e33c0dd31853e16a44dd8c7092580bac8e6e159 Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 21:58:28 +0800 Subject: [PATCH 03/11] Update egg-e-t-legacy.json - Correct stop command - Add MAP to start params and server vars so server will init - Work in /tmp/ to avoid leaving installers and unneeded files in the server directory - Slightly re-order some of the setup code - Add startup string matching so server can update status to running - Create '/mnt/server/.etlegacy' during setup needed for the servers sqlite database (server wont create it its self) --- etlegacy/etlegacy/egg-e-t-legacy.json | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 2c3fec2d..27ad99b6 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-11T06:46:01-04:00", + "exported_at": "2019-04-29T21:52: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}}", + "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": "{}", + "startup": "{\r\n \"done\": \"------ Server Initialization ------\",\r\n \"userInteraction\": []\r\n}", "logs": "{}", - "stop": "^C" + "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 \/mnt\/server\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 ']+>' | 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 ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "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 ']+>' | 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 ']+>' | 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 ']+>' | 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" } @@ -31,6 +31,15 @@ "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" } ] -} \ No newline at end of file +} From 87a7612257d295de4a2e9afb26a1f25d3cec5aaf Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 22:10:02 +0800 Subject: [PATCH 04/11] Update egg-e-t-legacy.json Correct wget command for 64 bit installs --- etlegacy/etlegacy/egg-e-t-legacy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 27ad99b6..0f5dc4cc 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-04-29T21:52:18+08:00", + "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.", @@ -17,7 +17,7 @@ }, "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 ']+>' | 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 ']+>' | 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 ']+>' | 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", + "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 ']+>' | 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 ']+>' | 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 ']+>' | 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" } From 2ff5e4ba0599c0c96915b76b9a186e8a6ccd87fe Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 08:22:15 -0400 Subject: [PATCH 05/11] update issue templates and CONTRIBUTING.md --- .github/ISSUE_TEMPLATE/bugs.md | 2 ++ .github/ISSUE_TEMPLATE/request.md | 2 ++ .github/pull_request_template.md | 2 ++ CONTRIBUTING.md | 7 +++++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bugs.md b/.github/ISSUE_TEMPLATE/bugs.md index 82150487..8d0d4648 100644 --- a/.github/ISSUE_TEMPLATE/bugs.md +++ b/.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) diff --git a/.github/ISSUE_TEMPLATE/request.md b/.github/ISSUE_TEMPLATE/request.md index e2122585..eb47a9bb 100644 --- a/.github/ISSUE_TEMPLATE/request.md +++ b/.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 diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e70890ce..8285664e 100644 --- a/.github/pull_request_template.md +++ b/.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?: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 58a857fb..9662ccc9 100644 --- a/CONTRIBUTING.md +++ b/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, From 9b1f5b8958fb763ce48e70321a230d79b041cb2f Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 08:22:41 -0400 Subject: [PATCH 06/11] remove issue_template bug and request templates do the job already. --- .github/ISSUE_TEMPLATE/issue_template.md | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/issue_template.md diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md deleted file mode 100644 index 4b46de11..00000000 --- a/.github/ISSUE_TEMPLATE/issue_template.md +++ /dev/null @@ -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? \ No newline at end of file From c66621af60dba3154ef3f7d7e0f4c55de4134c28 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 08:49:12 -0400 Subject: [PATCH 07/11] updated many readme files --- README.md | 38 ++++++++++++++++--------------- bots/discord/README.md | 8 +++++++ bots/discord/discord.js/README.md | 4 +++- bots/discord/fragbot/README.md | 2 +- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 06c75448..ce2ce96c 100644 --- a/README.md +++ b/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,13 @@ 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/) @@ -47,14 +48,20 @@ 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/) - [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/) @@ -63,30 +70,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/) diff --git a/bots/discord/README.md b/bots/discord/README.md index 8615f33f..8c1cf53f 100644 --- a/bots/discord/README.md +++ b/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` diff --git a/bots/discord/discord.js/README.md b/bots/discord/discord.js/README.md index 7a241119..db4a930f 100644 --- a/bots/discord/discord.js/README.md +++ b/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. \ No newline at end of file +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. \ No newline at end of file diff --git a/bots/discord/fragbot/README.md b/bots/discord/fragbot/README.md index d3d58ff2..6ef6eedd 100644 --- a/bots/discord/fragbot/README.md +++ b/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 \ No newline at end of file +There are no ports required for fragbot \ No newline at end of file From c28822cbe6ce59659ceec5a848da260a8492e14b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 11 Mar 2019 06:47:12 -0400 Subject: [PATCH 08/11] Add ET Legacy --- etlegacy/etlegacy/README.md | 20 +++++++++++++++ etlegacy/etlegacy/egg-e-t-legacy.json | 36 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 etlegacy/etlegacy/README.md create mode 100644 etlegacy/etlegacy/egg-e-t-legacy.json diff --git a/etlegacy/etlegacy/README.md b/etlegacy/etlegacy/README.md new file mode 100644 index 00000000..38a65ea8 --- /dev/null +++ b/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 | \ No newline at end of file diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json new file mode 100644 index 00000000..2c3fec2d --- /dev/null +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-11T06:46:01-04: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}}", + "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": "{}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/mnt\/server\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 ']+>' | 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 ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "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" + } + ] +} \ No newline at end of file From 0ca91eb652e88a56eb47734038e260454354025d Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 21:58:28 +0800 Subject: [PATCH 09/11] Update egg-e-t-legacy.json - Correct stop command - Add MAP to start params and server vars so server will init - Work in /tmp/ to avoid leaving installers and unneeded files in the server directory - Slightly re-order some of the setup code - Add startup string matching so server can update status to running - Create '/mnt/server/.etlegacy' during setup needed for the servers sqlite database (server wont create it its self) --- etlegacy/etlegacy/egg-e-t-legacy.json | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 2c3fec2d..27ad99b6 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-11T06:46:01-04:00", + "exported_at": "2019-04-29T21:52: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}}", + "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": "{}", + "startup": "{\r\n \"done\": \"------ Server Initialization ------\",\r\n \"userInteraction\": []\r\n}", "logs": "{}", - "stop": "^C" + "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 \/mnt\/server\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 ']+>' | 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 ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "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 ']+>' | 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 ']+>' | 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 ']+>' | 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" } @@ -31,6 +31,15 @@ "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" } ] -} \ No newline at end of file +} From 307b52a0eaa1eb2d4d99266741fcaad3f57f5e8a Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 22:10:02 +0800 Subject: [PATCH 10/11] Update egg-e-t-legacy.json Correct wget command for 64 bit installs --- etlegacy/etlegacy/egg-e-t-legacy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 27ad99b6..0f5dc4cc 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-04-29T21:52:18+08:00", + "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.", @@ -17,7 +17,7 @@ }, "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 ']+>' | 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 ']+>' | 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 ']+>' | 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", + "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 ']+>' | 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 ']+>' | 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 ']+>' | 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" } From b4f0d5273ba05f4567f5fa64a35989402d9c7915 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 09:04:09 -0400 Subject: [PATCH 11/11] rebase and organize rebase on current master organize folders and READMEs --- README.md | 2 ++ {etlegacy => enemy_territory}/etlegacy/README.md | 2 +- {etlegacy => enemy_territory}/etlegacy/egg-e-t-legacy.json | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename {etlegacy => enemy_territory}/etlegacy/README.md (95%) rename {etlegacy => enemy_territory}/etlegacy/egg-e-t-legacy.json (100%) diff --git a/README.md b/README.md index ce2ce96c..6a998501 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,8 @@ 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](/enemy_territory/etlegacy/) + [Factorio](/factorio/factorio/) [Grand Theft Auto](/gta/) diff --git a/etlegacy/etlegacy/README.md b/enemy_territory/etlegacy/README.md similarity index 95% rename from etlegacy/etlegacy/README.md rename to enemy_territory/etlegacy/README.md index 38a65ea8..7330b1f4 100644 --- a/etlegacy/etlegacy/README.md +++ b/enemy_territory/etlegacy/README.md @@ -6,7 +6,7 @@ #### 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. +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. diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/enemy_territory/etlegacy/egg-e-t-legacy.json similarity index 100% rename from etlegacy/etlegacy/egg-e-t-legacy.json rename to enemy_territory/etlegacy/egg-e-t-legacy.json