From f7afbb9d53569209084f6ad6549e4584a6055ed1 Mon Sep 17 00:00:00 2001 From: Space Cheese <12695808+spacecheese@users.noreply.github.com> Date: Sun, 3 Jan 2021 17:56:41 +0000 Subject: [PATCH 01/26] Fix ts3 egg --- stock-eggs/voice-servers/egg-teamspeak3-server.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock-eggs/voice-servers/egg-teamspeak3-server.json b/stock-eggs/voice-servers/egg-teamspeak3-server.json index aeba7931..63c8a535 100644 --- a/stock-eggs/voice-servers/egg-teamspeak3-server.json +++ b/stock-eggs/voice-servers/egg-teamspeak3-server.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y tar curl jq\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(wget https:\/\/teamspeak.com\/versions\/server.json -qO - | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n\r\necho -e \"getting files from http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\"\r\ncurl http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", + "script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y tar curl jq bzip2\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/server.json -s | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n\r\necho -e \"getting files from http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\"\r\ncurl http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -42,4 +42,4 @@ "rules": "required|integer|between:1,65535" } ] -} \ No newline at end of file +} From 93dff0ae47a1873141e63b62c9917363f05ac8dd Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 3 Jan 2021 20:24:59 +0100 Subject: [PATCH 02/26] Fixed not working Ports and other things --- .../the_forest/egg-the-forest.json | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/steamcmd_servers/the_forest/egg-the-forest.json b/steamcmd_servers/the_forest/egg-the-forest.json index 1126a01a..6a23a60a 100644 --- a/steamcmd_servers/the_forest/egg-the-forest.json +++ b/steamcmd_servers/the_forest/egg-the-forest.json @@ -1,25 +1,28 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-12-14T01:03:24+02:00", + "exported_at": "2021-01-03T20:24:12+01:00", "name": "The Forest", "author": "admin@softwarenoob.com", "description": "As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. Build, explore, survive in this terrifying first-person survival horror simulator.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_wine-xvfb", - "startup": ".\/start.sh -serverip {{SERVER_IP}}:{{QUERY_PORT} -serversteamport {{STEAM_PORT}} -servergameport {{SERVER_PORT}} -serverqueryport {{QUERY_PORT}} -servername \"{{SERVER_NAME}}\" -serverplayers {{MAX_PLAYERS}} -difficulty {{SERVER_DIFFICULTY}}", + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:ubuntu_wine-xvfb" + ], + "startup": ".\/start.sh", "config": { - "files": "{\r\n \"\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"serverIP\": \"serverIP {{server.build.default.ip}}:{{server.build.env.QUERY_PORT}}\",\r\n \"serverSteamPort\": \"serverSteamPort {{server.build.env.STEAM_PORT}}\",\r\n \"serverGamePort\": \"serverGamePort {{server.build.default.port}}\",\r\n \"serverName\": \"serverName {{server.build.env.SERVER_NAME}}\",\r\n \"serverPlayers\": \"serverPlayers {{server.build.env.MAX_PLAYERS}}\",\r\n \"serverPassword\": \"serverPassword {{server.build.env.SERVER_PASS}}\",\r\n \"serverPasswordAdmin\": \"serverPasswordAdmin {{server.build.env.ADMIN_PASS}}\",\r\n \"serverSteamAccount\": \"serverSteamAccount {{server.build.env.STEAM_ACC}}\",\r\n \"difficulty\": \"difficulty {{server.build.env.SERVER_DIFFICULTY}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"serverIP\": \"serverIP {{server.build.default.ip}}:{{server.build.default.port}}\",\r\n \"serverSteamPort\": \"serverSteamPort {{server.build.env.STEAM_PORT}}\",\r\n \"serverGamePort\": \"serverGamePort {{server.build.default.port}}\",\r\n \"serverQueryPort\": \"serverQueryPort {{server.build.env.QUERY_PORT}}\",\r\n \"serverName\": \"serverName {{server.build.env.SERVER_NAME}}\",\r\n \"serverPlayers\": \"serverPlayers {{server.build.env.MAX_PLAYERS}}\",\r\n \"serverPassword\": \"serverPassword {{server.build.env.SERVER_PASS}}\",\r\n \"serverPasswordAdmin\": \"serverPasswordAdmin {{server.build.env.ADMIN_PASS}}\",\r\n \"serverSteamAccount\": \"serverSteamAccount {{server.build.env.STEAM_ACC}}\",\r\n \"enableVAC\": \"enableVAC {{server.build.env.VAC}}\",\r\n \"difficulty\": \"difficulty {{server.build.env.SERVER_DIFFICULTY}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Game autosave started\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\r\n\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\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## Configure wine and server startup config\r\nmkdir -p \/home\/container\/.wine64\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'\" > \/mnt\/server\/start.sh\r\nchmod +x \/mnt\/server\/start.sh", - "container": "ubuntu:18.04", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\r\n\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\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## Configure wine and server startup config\r\nmkdir -p \/home\/container\/.wine64\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'\" > \/mnt\/server\/start.sh\r\nchmod +x \/mnt\/server\/start.sh\r\n\r\n## Create Config\r\n\r\nmkdir -p $HOME\/TheForestDedicatedServer_Data\/forest\/config\/\r\n#rm -fR $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\ncat < $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\n\/\/ Dedicated Server Settings.\r\n\/\/ Server IP address - Note: If you have a router, this address is the internal address, and you need to configure ports forwarding, append the current game port here as well\r\nserverIP\r\n\/\/ Steam Communication Port - Note: If you have a router you will need to open this port.\r\nserverSteamPort\r\n\/\/ Game Communication Port - Note: If you have a router you will need to open this port.\r\nserverGamePort\r\n\/\/ Query Communication Port - Note: If you have a router you will need to open this port.\r\nserverQueryPort\r\n\/\/ Server display name\r\nserverName\r\n\/\/ Maximum number of players\r\nserverPlayers 5\r\n\/\/ Server password. blank means no password\r\nserverPassword\r\n\/\/ Server administration password. blank means no password\r\nserverPasswordAdmin\r\n\/\/ Your Steam account name. blank means anonymous (see Steam server account bellow)\r\nserverSteamAccount\r\n\/\/ Enable VAC (Valve Anti Cheat) on the server. off by default, uncomment to enable\r\nenableVAC on\r\n\/\/ Time between server auto saves in minutes\r\nserverAutoSaveInterval 15\r\n\/\/ Game difficulty mode. Must be set to \"Peaceful\" \"Normal\" or \"Hard\"\r\ndifficulty Normal\r\n\/\/ New or continue a game. Must be set to \"New\" or \"Continue\"\r\ninitType New\r\n\/\/ Slot to save the game. Must be set 1 2 3 4 or 5\r\nslot 1\r\n\/\/ Show event log. Must be set \"off\" or \"on\"\r\nshowLogs off\r\n\/\/ Contact email for server admin\r\nserverContact email@gmail.com\r\n\/\/ No enemies. Must be set to \"on\" or \"off\"\r\nveganMode off\r\n\/\/ No enemies during day time. Must be set to \"on\" or \"off\"\r\nvegetarianMode off\r\n\/\/ Reset all structure holes when loading a save. Must be set to \"on\" or \"off\"\r\nresetHolesMode off\r\n\/\/ Regrow 10% of cut down trees when sleeping. Must be set to \"on\" or \"off\"\r\ntreeRegrowMode off\r\n\/\/ Allow building destruction. Must be set to \"on\" or \"off\"\r\nallowBuildingDestruction on\r\n\/\/ Allow enemies in creative games. Must be set to \"on\" or \"off\"\r\nallowEnemiesCreativeMode off\r\n\/\/ Allow clients to use the built in development console. Must be set to \"on\" or \"off\"\r\nallowCheats off\r\n\/\/ Allows defining a custom folder for save slots, leave empty to use the default location\r\nsaveFolderPath\r\n\/\/ Target FPS when no client is connected\r\ntargetFpsIdle 5\r\n\/\/ Target FPS when there is at least one client connected\r\ntargetFpsActive 60\r\nEOT", + "container": "debian:buster-slim", "entrypoint": "bash" } }, @@ -104,6 +107,15 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:20" + }, + { + "name": "Enable VAC", + "description": "", + "env_variable": "VAC", + "default_value": "on", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:3" } ] } \ No newline at end of file From b26b2613e16368a4af51003a4e5a3b7ba6405671 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 4 Jan 2021 08:36:06 +0100 Subject: [PATCH 03/26] Set VAC to off --- steamcmd_servers/the_forest/egg-the-forest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamcmd_servers/the_forest/egg-the-forest.json b/steamcmd_servers/the_forest/egg-the-forest.json index 6a23a60a..f23cea77 100644 --- a/steamcmd_servers/the_forest/egg-the-forest.json +++ b/steamcmd_servers/the_forest/egg-the-forest.json @@ -112,7 +112,7 @@ "name": "Enable VAC", "description": "", "env_variable": "VAC", - "default_value": "on", + "default_value": "off", "user_viewable": true, "user_editable": true, "rules": "required|string|max:3" From c8f3277a4823dfe84ad45658e680a501d2feef91 Mon Sep 17 00:00:00 2001 From: TekExplorer Date: Tue, 5 Jan 2021 19:33:25 +0000 Subject: [PATCH 04/26] Update bot eggs to have an image selection --- bots/discord/discord.js/egg-discord-js-generic.json | 5 +++++ bots/discord/discord.py/egg-discord-py-generic.json | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index 910958b6..42c60cdf 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -8,6 +8,11 @@ "author": "parker@parkervcp.com", "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12", + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-10", + "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12", + "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-14" + ], "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install --production; fi; \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}}", "config": { "files": "{}", diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/bots/discord/discord.py/egg-discord-py-generic.json index 6fa286c5..9d37bd7e 100644 --- a/bots/discord/discord.py/egg-discord-py-generic.json +++ b/bots/discord/discord.py/egg-discord-py-generic.json @@ -8,6 +8,10 @@ "author": "parker@parkervcp.com", "description": "A Discord bot written in Python using discord.py\r\n\r\nhttps:\/\/github.com\/Ispira\/pixel-bot", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_python-3.8", + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_python-3.8", + "quay.io\/parkervcp\/pterodactyl-images:debian_python-2.7" + ], "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${PY_PACKAGES} ]]; then pip install -U --target \/home\/container\/ ${PY_PACKAGES}; fi; if [[ -f \/home\/container\/requirements.txt ]]; then pip install -U --target \/home\/container\/ -r requirements.txt; fi; \/usr\/local\/bin\/python \/home\/container\/{{BOT_PY_FILE}}", "config": { "files": "{}", From 46dba68dbab536e5afeb0ea6c87eb3f0245426f2 Mon Sep 17 00:00:00 2001 From: TekExplorer Date: Tue, 5 Jan 2021 19:39:42 +0000 Subject: [PATCH 05/26] Add multiple java images to minecraft eggs --- .../forge/curseforge-generic/egg-curseforge-generic.json | 4 ++++ minecraft/java/forge/forge/egg-forge-enhanced.json | 4 ++++ minecraft/java/ftb/egg-ftb-modpacksch-server.json | 4 ++++ minecraft/java/magma/egg-magma.json | 4 ++++ minecraft/java/mohist/egg-mohist.json | 4 ++++ minecraft/java/paper/egg-paper.json | 7 ++++++- minecraft/java/purpur/egg-purpur.json | 6 +++++- minecraft/java/spigot/egg-spigot.json | 6 +++++- minecraft/java/spongeforge/egg-sponge-forge.json | 4 ++++ minecraft/java/spongevanilla/egg-sponge-vanilla.json | 4 ++++ minecraft/java/vanillacord/egg-vanilla-cord.json | 4 ++++ minecraft/proxy/cross_platform/waterdog/egg-waterdog.json | 4 ++++ minecraft/proxy/java/travertine/egg-travertine.json | 7 +++++-- minecraft/proxy/java/waterfall/egg-waterfall.json | 6 +++++- stock-eggs/minecraft/egg-bungeecord.json | 4 ++++ stock-eggs/minecraft/egg-forge-minecraft.json | 4 ++++ stock-eggs/minecraft/egg-paper.json | 6 +++++- stock-eggs/minecraft/egg-vanilla-minecraft.json | 4 ++++ 18 files changed, 79 insertions(+), 7 deletions(-) diff --git a/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 3b3a14b6..0c6e7a89 100644 --- a/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -9,6 +9,10 @@ "description": "A generic egg for a forge modpack", "features": null, "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server.jar", "config": { "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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/forge/forge/egg-forge-enhanced.json b/minecraft/java/forge/forge/egg-forge-enhanced.json index 36f4b2ea..f145f4e1 100644 --- a/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -9,6 +9,10 @@ "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.", "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/ftb/egg-ftb-modpacksch-server.json b/minecraft/java/ftb/egg-ftb-modpacksch-server.json index ab911abb..48f6a86e 100644 --- a/minecraft/java/ftb/egg-ftb-modpacksch-server.json +++ b/minecraft/java/ftb/egg-ftb-modpacksch-server.json @@ -8,6 +8,10 @@ "author": "runemaster580@gmail.com", "description": "Since the release of the FTB APP, FTB modpacks are now distributed through modpacks.ch. This egg was developed for support for modpacks that are distributed through this.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar forge-server.jar", "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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/magma/egg-magma.json b/minecraft/java/magma/egg-magma.json index 52d31ba4..c77aebdf 100644 --- a/minecraft/java/magma/egg-magma.json +++ b/minecraft/java/magma/egg-magma.json @@ -8,6 +8,10 @@ "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", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "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}", diff --git a/minecraft/java/mohist/egg-mohist.json b/minecraft/java/mohist/egg-mohist.json index 8b675b74..947a2693 100644 --- a/minecraft/java/mohist/egg-mohist.json +++ b/minecraft/java/mohist/egg-mohist.json @@ -9,6 +9,10 @@ "description": "Spigot fork with performance optimizations.", "features": null, "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} pause", "config": { "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}", diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index 63d37a01..99cbce89 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -8,7 +8,12 @@ "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", "features": ["eula"], - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11", + "quay.io\/pterodactyl\/core:java", + "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-15" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -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 \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/purpur/egg-purpur.json b/minecraft/java/purpur/egg-purpur.json index 0e87c446..d34763ae 100644 --- a/minecraft/java/purpur/egg-purpur.json +++ b/minecraft/java/purpur/egg-purpur.json @@ -10,7 +10,11 @@ "features": [ "eula" ], - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11", + "quay.io\/pterodactyl\/core:java" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -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 \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/spigot/egg-spigot.json b/minecraft/java/spigot/egg-spigot.json index f270f799..e59a33e0 100644 --- a/minecraft/java/spigot/egg-spigot.json +++ b/minecraft/java/spigot/egg-spigot.json @@ -8,7 +8,11 @@ "author": "support@pterodactyl.io", "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", "features": ["eula"], - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11", + "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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/spongeforge/egg-sponge-forge.json b/minecraft/java/spongeforge/egg-sponge-forge.json index 3ba615a1..8d921d24 100644 --- a/minecraft/java/spongeforge/egg-sponge-forge.json +++ b/minecraft/java/spongeforge/egg-sponge-forge.json @@ -9,6 +9,10 @@ "description": "A community-driven open source Minecraft: Java Edition modding platform.", "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "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 \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/minecraft/java/spongevanilla/egg-sponge-vanilla.json index 8e1995bc..349674e5 100644 --- a/minecraft/java/spongevanilla/egg-sponge-vanilla.json +++ b/minecraft/java/spongevanilla/egg-sponge-vanilla.json @@ -9,6 +9,10 @@ "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.", "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "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 \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/vanillacord/egg-vanilla-cord.json b/minecraft/java/vanillacord/egg-vanilla-cord.json index 83acf714..881a00dc 100644 --- a/minecraft/java/vanillacord/egg-vanilla-cord.json +++ b/minecraft/java/vanillacord/egg-vanilla-cord.json @@ -9,6 +9,10 @@ "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.", "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json index a2940430..82d35d4e 100644 --- a/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json +++ b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json @@ -9,6 +9,10 @@ "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.", "features": null, "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{}", diff --git a/minecraft/proxy/java/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json index ce4eb137..9c4c3ef9 100644 --- a/minecraft/proxy/java/travertine/egg-travertine.json +++ b/minecraft/proxy/java/travertine/egg-travertine.json @@ -8,7 +8,10 @@ "author": "parker@parkervcp.com", "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", @@ -61,4 +64,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/minecraft/proxy/java/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json index 4698ae4d..a80841ba 100644 --- a/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -8,7 +8,11 @@ "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11", + "quay.io\/pterodactyl\/core:java" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", diff --git a/stock-eggs/minecraft/egg-bungeecord.json b/stock-eggs/minecraft/egg-bungeecord.json index 7c34dece..e53ed759 100644 --- a/stock-eggs/minecraft/egg-bungeecord.json +++ b/stock-eggs/minecraft/egg-bungeecord.json @@ -8,6 +8,10 @@ "author": "support@pterodactyl.io", "description": "For a long time, Minecraft server owners have had a dream that encompasses a free, easy, and reliable way to connect multiple Minecraft servers together. BungeeCord is the answer to said dream. Whether you are a small server wishing to string multiple game-modes together, or the owner of the ShotBow Network, BungeeCord is the ideal solution for you. With the help of BungeeCord, you will be able to unlock your community's full potential.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].query_enabled\": true,\r\n \"listeners[0].query_port\": \"{{server.build.default.port}}\",\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"regex:^(127\\\\.0\\\\.0\\\\.1|localhost)(:\\\\d{1,5})?$\": \"{{config.docker.interface}}$2\"\r\n }\r\n }\r\n }\r\n}", diff --git a/stock-eggs/minecraft/egg-forge-minecraft.json b/stock-eggs/minecraft/egg-forge-minecraft.json index 6f404d1c..f547310d 100644 --- a/stock-eggs/minecraft/egg-forge-minecraft.json +++ b/stock-eggs/minecraft/egg-forge-minecraft.json @@ -8,6 +8,10 @@ "author": "support@pterodactyl.io", "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.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/stock-eggs/minecraft/egg-paper.json b/stock-eggs/minecraft/egg-paper.json index e402cb50..7278a7f5 100644 --- a/stock-eggs/minecraft/egg-paper.json +++ b/stock-eggs/minecraft/egg-paper.json @@ -7,7 +7,11 @@ "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "image": "quay.io\/pterodactyl\/core:java", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -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 \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/stock-eggs/minecraft/egg-vanilla-minecraft.json b/stock-eggs/minecraft/egg-vanilla-minecraft.json index fadd91a4..df90f74a 100644 --- a/stock-eggs/minecraft/egg-vanilla-minecraft.json +++ b/stock-eggs/minecraft/egg-vanilla-minecraft.json @@ -8,6 +8,10 @@ "author": "support@pterodactyl.io", "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "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}", From ac93225703fcb587a5c389d99643841c8a11932a Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:38:37 -0500 Subject: [PATCH 06/26] Update README.md Cleanups up discord bot list & removes old comment about needing to restart daemon after importing an egg. Not needed as of 1.X, in 0.7 (deprecate) it was. --- README.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8853b88d..0b9773f4 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,6 @@ If you are reading this it looks like you are looking to add an egg to your serv 4. Browse to the json file you saved earlier 5. Select what nest you want to put the egg in. 1. If you want a new nest you need to create it before importing the egg. -6. Restart the daemon on your node before creating a server using the new egg(s). - -# You must restart your daemon after importing an egg ## Please read the CONTRIBUTING.md before submitting PRs @@ -28,21 +25,21 @@ 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) +* [Bastion](/bots/discord/bastion) Node JS * [CorpBot](/bots/discord/corpbot) Python * [discord.js](bots/discord/discord.js) Node JS generic * [discord.py](bots/discord/discord.py) Python generic -* [discordgo](bots/discord/discordgo) golang generic +* [discordgo](bots/discord/discordgo) Golang generic * [fragbot](/bots/discord/fragbot) Golang -* [jmusicbot](/bots/discord/jmusicbot) Java +* [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) +* [Redbot](/bots/discord/redbot) Python +* [SinusBot](/bots/discord/sinusbot) * [Twitch](/bots/twitch) * [PhantomBot](/bots/twitch/phantombot) - * [sogeBot](/bots/twitch/sogebot) + * [SogeBot](/bots/twitch/sogebot) [Other](/bots/other) * [Big Brother Bot](/bots/other/bigbrotherbot) From 8b9301f8dcd12ef5ec8012cfac1ef7627aaae117 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:39:08 -0500 Subject: [PATCH 07/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b9773f4..7ca51c89 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Redbot](/bots/discord/redbot) Python * [SinusBot](/bots/discord/sinusbot) -* [Twitch](/bots/twitch) +[Twitch](/bots/twitch) * [PhantomBot](/bots/twitch/phantombot) * [SogeBot](/bots/twitch/sogebot) From 825dbd5f64935f11b1be7021b5ca8c09723675f5 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:39:59 -0500 Subject: [PATCH 08/26] Update README.md Fixes the listings, they weren't categorized properly. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7ca51c89..13e3141d 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,12 @@ If you are reading this it looks like you are looking to add an egg to your serv * [PhantomBot](/bots/twitch/phantombot) * [SogeBot](/bots/twitch/sogebot) +[TeamSpeak3](bots/teamspeak3) + * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) + [Other](/bots/other) * [Big Brother Bot](/bots/other/bigbrotherbot) -* [TeamSpeak3](bots/teamspeak3) - * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) - ## [Database](/database) ### In-Memory Databases [Redis](/database/redis) From cc2328a6ee468228a5d100d7a40f8dee0808eecc Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:57:24 -0500 Subject: [PATCH 09/26] Update README.md General cleanup --- README.md | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 13e3141d..5f8a5bfa 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [TS3-Manager](/voice_servers/ts3_manager) ## Game Eggs -[Among Us - Impostor Server](/among_us/impostor_server) - -[Among Us - CrewLink Server](/among_us/crewlink_server) +[Among Us](/among_us) +* [Impostor Server](/among_us/impostor_server) +* [CrewLink Server](/among_us/crewlink_server) [Cryofall](/cryofall) @@ -107,12 +107,12 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Magma](/minecraft/java/magma) * [Paper](/minecraft/java/paper) * [Purpur](/minecraft/java/purpur) - * [Spigot](/minecraft/java/spigot/) - * [SpongeForge](/minecraft/java/spongeforge/) - * [SpongeVanilla](/minecraft/java/spongevanilla/) - * [Technic](/minecraft/java/technic/) - * [Tuinity](/minecraft/java/tuinity/) - * [VanillaCord](/minecraft/java/vanillacord/) + * [Spigot](/minecraft/java/spigot) + * [SpongeForge](/minecraft/java/spongeforge) + * [SpongeVanilla](/minecraft/java/spongevanilla) + * [Technic](/minecraft/java/technic) + * [Tuinity](/minecraft/java/tuinity) + * [VanillaCord](/minecraft/java/vanillacord) * [Mohist](/minecraft/java/mohist) * [Proxies](/minecraft/proxy) Minecraft Server Proxies @@ -126,19 +126,17 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Waterdog](/minecraft/proxy/cross_platform/waterdog) * DragonProxy abandoned in favour of GeyserMC. - [OpenRA](/openra) * [OpenRA Dune2000](/openra/openra_dune2000) * [OpenRA Red Alert](/openra/openra_red_alert) * [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn) - [Red Dead Redemption](/rdr) * [RedM](/rdr/redm) [steamcmd servers](/steamcmd_servers) These eggs use steamcmd to install * [7 Days to Die](/steamcmd_servers/7_days_to_die) -* [ARK Survival Evolved](/steamcmd_servers/ark_survival_evolved) +* [ARK: Survival Evolved](/steamcmd_servers/ark_survival_evolved) * [Arma](/steamcmd_servers/arma) * [Arma 3](/steamcmd_servers/arma/arma3) * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client) @@ -148,7 +146,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Barotrauma](/steamcmd_servers/barotrauma) * [Citadel: Forged with Fire](/steamcmd_servers/citadel) * [Conan Exiles](/steamcmd_servers/conan_exiles) -* [Don't Starve](/steamcmd_servers/dont_starve) +* [Don't Starve Together](/steamcmd_servers/dont_starve) * [ECO](/steamcmd_servers/eco) * [HLDS server](/steamcmd_servers/hlds_server) * [Holdfast](/steamcmd_servers/holdfast) @@ -157,9 +155,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Killing Floor 2](/steamcmd_servers/killingfloor2) * [Mordhau](/steamcmd_servers/mordhau) * [Onset](/steamcmd_servers/onset) -* [PixARK](/steamcmd_servers/pixark/) -* [Project Zomboid](/steamcmd_servers/project_zomboid/) -* [Quake Live](/steamcmd_servers/quake_live/) +* [PixARK](/steamcmd_servers/pixark) +* [Project Zomboid](/steamcmd_servers/project_zomboid) +* [Quake Live](/steamcmd_servers/quake_live) * [Rising World](/steamcmd_servers/rising_world) * [Rust Staging Branch](/steamcmd_servers/rust_staging) * [SCP: Secret Laboratory](/steamcmd_servers/scpsl) @@ -175,12 +173,12 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Unturned](/steamcmd_servers/unturned) [Teeworlds](/teeworlds) -* [teeworlds](/teeworlds/teeworlds) +* [Teeworlds](/teeworlds/teeworlds) [Terraria](/terraria) -* [vanilla](/terraria/vanilla) -* [tmodloader](/terraria/tmodloader) -* [tshock](/terraria/tshock) +* [Vanilla](/terraria/vanilla) +* [tModLoader](/terraria/tmodloader) +* [TShock](/terraria/tshock) [Tycoon Games](/tycoon_games) * [OpenTTD](/tycoon_games/openttd) From d0b308002a08e4a19920396878dc439093c9cd49 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 19:18:56 -0500 Subject: [PATCH 10/26] Minecraft Readme Organization Minecraft README Revamp, adds VanillaCord, Fabric and SpongeForge, organizes them into the respective categorizes, --- README.md | 2 +- minecraft/java/README.md | 55 ++++++++++++++++------------ minecraft/java/spongeforge/README.MD | 2 +- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 5f8a5bfa..2d2561a7 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Minetest](/minetest) (including MTG) [Minecraft](/minecraft) -* [Bedrock](/minecraft/bedrock) +* [Bedrock](/minecraft/bedrock) Servers for Bedrock Minecraft * [Bedrock](/minecraft/bedrock/bedrock) * [gomint](/minecraft/bedrock/gomint) * [Nukkit](/minecraft/bedrock/nukkit) diff --git a/minecraft/java/README.md b/minecraft/java/README.md index 2e4dd186..efe81b92 100644 --- a/minecraft/java/README.md +++ b/minecraft/java/README.md @@ -8,21 +8,28 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. ## Cuberite +[Cuberite](https://cuberite.org) A lightweight, fast and extensible game server for Minecraft -[Cuberite](https://cuberite.org/) + +## Fabric +[Fabric](https://fabricmc.net) +Fabric is a lightweight, experimental modding toolchain for Minecraft. ## Feather [Feather](https://github.com/feather-rs/feather) An experimental Minecraft server implementation in Rust ## Forge -[Forge MC](https://files.minecraftforge.net/) +[Forge MC](https://files.minecraftforge.net) This is a direct fork of the default forge service - Has a version detection fix for "latest" -[Curse Generic](https://www.curseforge.com/) +[Curse Generic](https://www.curseforge.com) A generic service to pull forge mod packs from the curseforge site. +[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. + ## FTB Packs [FTB Modpacks](https://api.modpacks.ch) A generic service to pull FTB modpacks from api.modpacks.ch. @@ -47,26 +54,32 @@ The second method requires you to know the id for both the modpack and version i may not get updated with the correct ip address and port at first launch. Please restart the server after first launch to fix this.** -## 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. - -[PaperMC GitHub](https://github.com/PaperMC/Paper) -High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies - ## Spigot A collection of spigot and forked spigot eggs. -[Spigot](https://www.spigotmc.org/) +[PaperMC GitHub](https://github.com/PaperMC/Paper) +High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies +Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar. + +[Purpur](https://purpur.pl3x.net) +Purpur is a fork of Paper and Tuinity with the goal of providing new and interesting configuration options, which allow for creating a unique gameplay experience not seen anywhere else + +[Spigot](https://www.spigotmc.org) This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar. - (It's noted that building the jar is intensive and time consuming) -## Sponge +[Mohist Github](https://github.com/Mohist-Community) +Fork of Spigot focused on performance optimizations. -[SpongeVanilla](https://www.spongepowered.org/) +[Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) +Fork of Paper aimed at improving server performance at high playercounts. + + +## Sponge Powered +[SpongeForge](https://www.spongepowered.org) +SpongeForge is the implementation of the Sponge API on the Minecraft Forge platform. + +[SpongeVanilla](https://www.spongepowered.org) A community-driven open source Minecraft: Java Edition modding platform. ## Technic Packs @@ -82,10 +95,6 @@ The ancient power of Tekkits past return in this legendary pack! [Tekkit Classic](https://www.technicpack.net/modpack/tekkit.552560) The official Tekkit Classic modpack. Build factories, automate crafting! -## Tuinity -Fork of Paper aimed at improving server performance at high playercounts. -[Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) - -## Mohist -Fork of Spigot focused on performance optimizations. -[Mohist Github](https://github.com/Mohist-Community) +## VanillaCord +[VanillaCord](https://github.com/ME1312/VanillaCord) +VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers \ No newline at end of file diff --git a/minecraft/java/spongeforge/README.MD b/minecraft/java/spongeforge/README.MD index 685f7f66..aaab3d9b 100644 --- a/minecraft/java/spongeforge/README.MD +++ b/minecraft/java/spongeforge/README.MD @@ -2,7 +2,7 @@ SpongeForge is the implementation of the Sponge API on the Minecraft Forge platform. ## Server Ports -Minecraft servers requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| From a5453609ad04badc37e9ff802ea02bbac0cd0475 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 19:28:45 -0500 Subject: [PATCH 11/26] Consistency fixes mainly Repairs consistency across these eggs and removes warning that was needed for the previous daemon system. --- minecraft/java/README.md | 2 +- minecraft/java/cuberite/README.md | 1 + minecraft/java/forge/curseforge-generic/README.md | 8 ++++++++ minecraft/java/forge/forge/README.md | 10 +++++++++- minecraft/java/ftb/README.md | 2 +- minecraft/java/purpur/README.md | 8 ++++++++ minecraft/java/spongeforge/README.MD | 1 + minecraft/java/technic/README.md | 3 --- minecraft/java/vanillacord/README.md | 8 ++++++++ 9 files changed, 37 insertions(+), 6 deletions(-) diff --git a/minecraft/java/README.md b/minecraft/java/README.md index efe81b92..eb83be7e 100644 --- a/minecraft/java/README.md +++ b/minecraft/java/README.md @@ -57,7 +57,7 @@ Please restart the server after first launch to fix this.** ## Spigot A collection of spigot and forked spigot eggs. -[PaperMC GitHub](https://github.com/PaperMC/Paper) +[PaperMC GitHub](https://github.com/PaperMC/Paper) High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar. diff --git a/minecraft/java/cuberite/README.md b/minecraft/java/cuberite/README.md index b5c0b2a5..495a718b 100644 --- a/minecraft/java/cuberite/README.md +++ b/minecraft/java/cuberite/README.md @@ -1,4 +1,5 @@ # Cuberite + A lightweight, fast and extensible game server for Minecraft ## Server Ports diff --git a/minecraft/java/forge/curseforge-generic/README.md b/minecraft/java/forge/curseforge-generic/README.md index e136c371..cc1647db 100644 --- a/minecraft/java/forge/curseforge-generic/README.md +++ b/minecraft/java/forge/curseforge-generic/README.md @@ -8,3 +8,11 @@ This can be found on the modpack page in the `About Project` section in the uppe This will grab the latest release when the version is set to latest. It "should" grab versions of the pack based on the modpack version numbers + +## 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 diff --git a/minecraft/java/forge/forge/README.md b/minecraft/java/forge/forge/README.md index 72585414..634470a8 100644 --- a/minecraft/java/forge/forge/README.md +++ b/minecraft/java/forge/forge/README.md @@ -4,4 +4,12 @@ This will download the latest jar for a specific forge version. -this has a fix for the broken 1.7.10 and 1.8.9 versions forge has \ No newline at end of file +this has a fix for the broken 1.7.10 and 1.8.9 versions forge has + +## 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 diff --git a/minecraft/java/ftb/README.md b/minecraft/java/ftb/README.md index cce1799e..fcf4d375 100644 --- a/minecraft/java/ftb/README.md +++ b/minecraft/java/ftb/README.md @@ -22,7 +22,7 @@ may not get updated with the correct ip address and port at first launch. Please restart the server after first launch to fix this.** ## Server Ports -The minecraft server requires a single port for access (default 25565) but some plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | diff --git a/minecraft/java/purpur/README.md b/minecraft/java/purpur/README.md index e5f56597..59789e93 100644 --- a/minecraft/java/purpur/README.md +++ b/minecraft/java/purpur/README.md @@ -3,3 +3,11 @@ Purpur is a fork of Paper and Tuinity which provides new configuration options. See https://github.com/pl3xgaming/purpur for additional information. + +## 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 diff --git a/minecraft/java/spongeforge/README.MD b/minecraft/java/spongeforge/README.MD index aaab3d9b..deedf5a3 100644 --- a/minecraft/java/spongeforge/README.MD +++ b/minecraft/java/spongeforge/README.MD @@ -4,6 +4,7 @@ SpongeForge is the implementation of the Sponge API on the Minecraft Forge platf ## 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 diff --git a/minecraft/java/technic/README.md b/minecraft/java/technic/README.md index 5e1f1426..05480aa7 100644 --- a/minecraft/java/technic/README.md +++ b/minecraft/java/technic/README.md @@ -9,9 +9,6 @@ If you are reading this it looks like you are looking to add an egg to your serv 4. Browse to the json file you saved earlier 5. Select what nest you want to put the egg in. 1. If you want a new nest you need to create it before importing the egg. -6. Restart the daemon on your node before creating a server using the new egg(s). - -# You must restart your daemon after importing an egg ## Technic Eggs diff --git a/minecraft/java/vanillacord/README.md b/minecraft/java/vanillacord/README.md index c5d91e0e..03b4b2c5 100644 --- a/minecraft/java/vanillacord/README.md +++ b/minecraft/java/vanillacord/README.md @@ -7,3 +7,11 @@ This uses [ME1312's fork](https://github.com/ME1312/VanillaCord) of VanillaCord ## Note: If you've set up Spigot, Paper or some other server with BungeeCord's IP forwarding you might know that you have to set online-mode to false. Due to the way that VanillaCord works this is not necessary with this Egg, you can (and should) leave online-mode as true. + +## 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 4bafd6480630be2904eb2b522c12d8e24f32061b Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 19:39:15 -0500 Subject: [PATCH 12/26] update readme Fixes rust links, capitalizes SteamCMD, updates the Cryofall link to have a double /cryofall (Idk why both Xonotic & Cryofall does this lol) --- README.md | 12 +++++++----- among_us/crewlink_server/README.md | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2d2561a7..6493bf9e 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Impostor Server](/among_us/impostor_server) * [CrewLink Server](/among_us/crewlink_server) -[Cryofall](/cryofall) +[Cryofall](/cryofall/cryofall) [ET Legacy](/enemy_territory/etlegacy) @@ -87,7 +87,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Mindustry](/mindustry) -[LeagueSandbox](/leaguesandbox) +[League Sandbox](/leaguesandbox) [Minetest](/minetest) (including MTG) @@ -134,7 +134,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Red Dead Redemption](/rdr) * [RedM](/rdr/redm) -[steamcmd servers](/steamcmd_servers) These eggs use steamcmd to install +[SteamCMD Servers](/steamcmd_servers) These eggs use SteamCMD to install * [7 Days to Die](/steamcmd_servers/7_days_to_die) * [ARK: Survival Evolved](/steamcmd_servers/ark_survival_evolved) * [Arma](/steamcmd_servers/arma) @@ -152,14 +152,16 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Holdfast](/steamcmd_servers/holdfast) * [Hurtworld](/steamcmd_servers/hurtworld) * [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) -* [Killing Floor 2](/steamcmd_servers/killingfloor2) +* [Killing Floor 2](/steamcmd_servers/killing_floor_2) * [Mordhau](/steamcmd_servers/mordhau) * [Onset](/steamcmd_servers/onset) * [PixARK](/steamcmd_servers/pixark) * [Project Zomboid](/steamcmd_servers/project_zomboid) * [Quake Live](/steamcmd_servers/quake_live) * [Rising World](/steamcmd_servers/rising_world) -* [Rust Staging Branch](/steamcmd_servers/rust_staging) +* [Rust](/steamcmd_servers/rust) + * [Autowipe](/steamcmd_servers/rust/rust_autowipe) + * [Staging](/steamcmd_servers/rust/rust_staging) * [SCP: Secret Laboratory](/steamcmd_servers/scpsl) * [dedicated](/steamcmd_servers/scpsl/dedicated) * [multiadmin](/steamcmd_servers/scpsl/multiadmin) diff --git a/among_us/crewlink_server/README.md b/among_us/crewlink_server/README.md index 14b45b1b..871ce5d9 100644 --- a/among_us/crewlink_server/README.md +++ b/among_us/crewlink_server/README.md @@ -1,4 +1,4 @@ -# Among Us - CrewLink server +# Among Us - CrewLink Server ### From their [Github](https://github.com/ottomated/CrewLink) This project implements proximity voice chat in Among Us. Everyone in an Among Us lobby with this program running will be able to communicate over voice in-game, with no third-party programs required. Spatial audio ensures that you can only hear people close to you. From 7d140f647618b30fa6c3d7204a7c039cf5c907de Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 19:51:25 -0500 Subject: [PATCH 13/26] Update README.md Rust Autowipe egg isn't on staging branch --- steamcmd_servers/rust/rust_autowipe/README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/steamcmd_servers/rust/rust_autowipe/README.md b/steamcmd_servers/rust/rust_autowipe/README.md index 3e5882df..27532983 100644 --- a/steamcmd_servers/rust/rust_autowipe/README.md +++ b/steamcmd_servers/rust/rust_autowipe/README.md @@ -11,13 +11,6 @@ Files listed in the `REMOVE_FILES` variabe, space separated, will be removed. The server requires at least 4096MB to run properly. This is mostly needed for the startup only, once it is running (depending on your world size) it should consume less. -### Modding warning -Due to Oxide/uMod not supporting the staging branch, you will not be able to Mod this server. - -Wulf (Community Admin on Oxidemod/uMod): - -"We only release builds for the release/public branch of Rust, so if you'd like to use it on any other branch, you'd need to manually patch it yourself using our patcher tool founder under the Snapshots repo. To switch a different Rust branch, just use the -beta tag with SteamCMD and the branch name." - ### Server Ports Ports required to run the server. From b84a2bf57522bfe75dda61188ce38b5d8c1e1131 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:12:53 -0500 Subject: [PATCH 14/26] Updates daemon warning Adds a note saying daemon restart is required if using 0.7. Removes warning in the technic folder because it doesn't make sense to be there, imo. --- README.md | 3 +++ minecraft/java/technic/README.md | 12 ------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6493bf9e..a13598d9 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ If you are reading this it looks like you are looking to add an egg to your serv 4. Browse to the json file you saved earlier 5. Select what nest you want to put the egg in. 1. If you want a new nest you need to create it before importing the egg. +6. Restart the daemon on your node before creating a server using the new egg(s). + +# You must restart your daemon after importing an egg if you are using 0.7, this is not required on 1.X. ## Please read the CONTRIBUTING.md before submitting PRs diff --git a/minecraft/java/technic/README.md b/minecraft/java/technic/README.md index 05480aa7..bde7d244 100644 --- a/minecraft/java/technic/README.md +++ b/minecraft/java/technic/README.md @@ -1,15 +1,3 @@ -## How to import an egg - -If you are reading this it looks like you are looking to add an egg to your server. - -1. Download any of the json files located in the folders below. - 1. It's easiest to right click the `raw` button and save as. -2. In your panel go to the `Nests` section in the admin part of the panel -3. Click the green `Import Egg` button -4. Browse to the json file you saved earlier -5. Select what nest you want to put the egg in. - 1. If you want a new nest you need to create it before importing the egg. - ## Technic Eggs [Technic](/minecraft/java/technic/) From 352227974e740652078e7ca0fe869a187c305b79 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:16:53 -0500 Subject: [PATCH 15/26] Updates daemon warning Updates daemon warning & adds a little note indicating what devices support bedrock edition. --- README.md | 3 +-- minecraft/README.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a13598d9..58da5534 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ If you are reading this it looks like you are looking to add an egg to your serv 4. Browse to the json file you saved earlier 5. Select what nest you want to put the egg in. 1. If you want a new nest you need to create it before importing the egg. -6. Restart the daemon on your node before creating a server using the new egg(s). # You must restart your daemon after importing an egg if you are using 0.7, this is not required on 1.X. @@ -95,7 +94,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Minetest](/minetest) (including MTG) [Minecraft](/minecraft) -* [Bedrock](/minecraft/bedrock) Servers for Bedrock Minecraft +* [Bedrock](/minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console) * [Bedrock](/minecraft/bedrock/bedrock) * [gomint](/minecraft/bedrock/gomint) * [Nukkit](/minecraft/bedrock/nukkit) diff --git a/minecraft/README.md b/minecraft/README.md index 6502f2e3..2becadf6 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -34,4 +34,4 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) - * DragonProxy abandoned in favour of GeyserMC. + * DragonProxy abandoned in favour of GeyserMC. From 8ca73a6eab750b6fd45da5addf0fafe6641a0964 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:22:13 -0500 Subject: [PATCH 16/26] Repairs alphabetical ordering Repairs alphabetical ordering of the minecraft eggs --- README.md | 6 +++--- minecraft/README.md | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 58da5534..8c9b9628 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Feed The Beast](/minecraft/java/ftb) * [Forge](/minecraft/java/forge) * [Magma](/minecraft/java/magma) + * [Mohist](/minecraft/java/mohist) * [Paper](/minecraft/java/paper) * [Purpur](/minecraft/java/purpur) * [Spigot](/minecraft/java/spigot) @@ -115,14 +116,13 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Technic](/minecraft/java/technic) * [Tuinity](/minecraft/java/tuinity) * [VanillaCord](/minecraft/java/vanillacord) - * [Mohist](/minecraft/java/mohist) * [Proxies](/minecraft/proxy) Minecraft Server Proxies * [Java](/minecraft/proxy/java) - * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [Waterfall](/minecraft/proxy/java/waterfall) * [Travertine](/minecraft/proxy/java/travertine) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) * [Velocity](/minecraft/proxy/java/velocity) + * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) diff --git a/minecraft/README.md b/minecraft/README.md index 2becadf6..80786938 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -6,6 +6,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, [Bedrock](/minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console) * [Bedrock](/minecraft/bedrock/bedrock) +* [gomint](/minecraft/bedrock/gomint) * [Nukkit](/minecraft/bedrock/nukkit) * [PocketMine MP](/minecraft/bedrock/pocketmine_mp) @@ -16,6 +17,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Feed The Beast](/minecraft/java/ftb) * [Forge](/minecraft/java/forge) * [Magma](/minecraft/java/magma) +* [Mohist](/minecraft/java/mohist) * [Paper](/minecraft/java/paper) * [Spigot](/minecraft/java/spigot) * [SpongeForge](/minecraft/java/spongeforge) @@ -23,14 +25,13 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Technic](/minecraft/java/technic) * [Tuinity](/minecraft/java/tuinity) * [VanillaCord](/minecraft/java/vanillacord) -* [Mohist](/minecraft/java/mohist) * [Proxies](/minecraft/proxy) Minecraft Server Proxies * [Java](/minecraft/proxy/java) - * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [Waterfall](/minecraft/proxy/java/waterfall) * [Travertine](/minecraft/proxy/java/travertine) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) * [Velocity](/minecraft/proxy/java/velocity) + * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) From 560bdbcb4fceb6c7b60fca3a06d3b0bf731d38cf Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:46:42 -0500 Subject: [PATCH 17/26] SteamCMD Servers cleanup Adds missing games, cleans up readme, fixes links, etc. --- README.md | 10 ++--- steamcmd_servers/README.md | 85 +++++++++++++++++++++----------------- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 8c9b9628..e6fe4087 100644 --- a/README.md +++ b/README.md @@ -150,8 +150,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Conan Exiles](/steamcmd_servers/conan_exiles) * [Don't Starve Together](/steamcmd_servers/dont_starve) * [ECO](/steamcmd_servers/eco) -* [HLDS server](/steamcmd_servers/hlds_server) -* [Holdfast](/steamcmd_servers/holdfast) +* [HLDS Server](/steamcmd_servers/hlds_server) +* [Holdfast: Nations At War](/steamcmd_servers/holdfast) * [Hurtworld](/steamcmd_servers/hurtworld) * [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) * [Killing Floor 2](/steamcmd_servers/killing_floor_2) @@ -168,11 +168,11 @@ If you are reading this it looks like you are looking to add an egg to your serv * [dedicated](/steamcmd_servers/scpsl/dedicated) * [multiadmin](/steamcmd_servers/scpsl/multiadmin) * [Soldat](/steamcmd_servers/soldat) +* [Squad](/steamcmd_servers/squad) * [Starbound](/steamcmd_servers/starbound) * [Stationeers](/steamcmd_servers/stationeers) -* [Stormworks](/steamcmd_servers/stormworks) +* [Stormworks: Build and Rescue](/steamcmd_servers/stormworks) * [Sven Co-op](/steamcmd_servers/svencoop) -* [Squad](/steamcmd_servers/squad) * [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic) * [Unturned](/steamcmd_servers/unturned) @@ -197,4 +197,4 @@ If you are reading this it looks like you are looking to add an egg to your serv ## [Storage](/storage/) ### S3 Storage -* [minio](/storage/minio) +* [minio](/storage/minio) \ No newline at end of file diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index bf3440e0..ce8fac38 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -1,89 +1,100 @@ -# steamcmd servers +# SteamCMD Servers -This is a collection of servers that use steamcmd to install. +This is a collection of servers that use SteamCMD to install. ## 7 Days To Die -[7dtd](7_days_to_die/) +[7 Days To Die](7_days_to_die) -## ARK -[ark](ark_survival_evolved/) +## ARK: Survival Evolved +[ARK: Survival Evolved](ark_survival_evolved) -## ARMA -[arma](arma/) -* [arma 3](arma/arma3/) -* [arma 3 headless](arma/arma3_headless_client/) +## Arma +[Arma](arma) +* [Arma 3](arma/arma3) +* [Arma 3 HC](arma/arma3_headless_client) +* [Arma 3 HC](arma/arma3_x64)) ## Avorion -[avorion](avorion/) +[Avorion](avorion) ## Assetto Corsa -[assetto_corsa](assetto_corsa/) +[Assetto Corsa](assetto_corsa) ## Barotrauma -[barotrauma](barotrauma/) +[Barotrauma](barotrauma) ## Citadel: Forged with Fire -[citadel](citadel/) +[citadel](citadel) ## Conan Exiles -[conan_exiles](conan_exiles/) +[Conan Exiles](conan_exiles) -## Don't Starve -[dont_starve](dont_starve/) +## Don't Starve Together +[Don't Starve Together](dont_starve) ## ECO -[ECO](eco/) +[ECO](eco) ## HLDS Server -[hlds](hlds_server/) +[HLDS Server](hlds_server) -## Holdfast -[holdfast](holdfast/) +## Holdfast: Nations At War +[Holdfast: Nations At War](holdfast) ## Hurtworld -[hurtworld](hurtworld/) +[Hurtworld](hurtworld) ## Insurgency: Sandstorm -[Insurgency: Sandstorm](insurgency_sandstorm/) +[Insurgency: Sandstorm](insurgency_sandstorm) + +## Killing Floor 2 +[Killing Floor 2](killing_floor_2) ## Mordhau -[mordhau](mordhau/) +[Mordhau](mordhau) ## Onset -[onset](onset/) +[Onset](onset) + +## PixARK +[PixARK](pixark) ## Project Zomboid -[project_zomboid](project_zomboid/) +[Project Zomboid](project_zomboid) ## Quake Live -[Quake Live](quake_live/) +[Quake Live](quake_live) ## Rising World -[rising_world](rising_world/) +[Rising World](rising_world) -## Rust Staging -[rust staging](rust_staging/) +## Rust +* [Rust](rust) + * [Autowipe](rust/rust_autowipe) + * [Staging](rust/rust_staging) ## SCP: Secret Laboratory -[SCP: Secret Laboratory](/scpsl/) +* [SCP: Secret Laboratory](scpsl) + * [dedicated](scpsl/dedicated) + * [multiadmin](scpsl/multiadmin) ## Soldat -[soldat](soldat/) +[Soldat](soldat) ## Squad -[squad](squad/) +[Squad](squad) ## Starbound -[starbound](starbound/) +[Starbound](starbound) ## Stationeers -[Stationeers](/steamcmd_servers/stationeers/) +[Stationeers](stationeers) ## Stormworks: Build and Rescue -[Stormworks](/steamcmd_servers/stormworks/) +[Stormworks: Build and Rescue](stormworks) ## Sven coop -[svencoop](svencoop) +[Sven Co-op](svencoop) ## Team Fortress 2 Classic [Team Fortress 2 Classic](team_fortress_2_classic) @@ -95,4 +106,4 @@ This is a collection of servers that use steamcmd to install. [Tower Unite](tower_unite) ## Unturned - * [Unturned](unturned) +[Unturned](unturned) \ No newline at end of file From a32d4cef4bb97756d32332177152ef2cec6abbf1 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:56:12 -0500 Subject: [PATCH 18/26] Arma 3 readme cleanup Arma 3 x64 isn't a HC, fixes up the arma readme --- README.md | 4 ++-- steamcmd_servers/README.md | 4 ++-- steamcmd_servers/arma/README.md | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e6fe4087..896fcecf 100644 --- a/README.md +++ b/README.md @@ -141,8 +141,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [ARK: Survival Evolved](/steamcmd_servers/ark_survival_evolved) * [Arma](/steamcmd_servers/arma) * [Arma 3](/steamcmd_servers/arma/arma3) - * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client) - * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64) + * [Arma 3 64 Bit](/steamcmd_servers/arma/arma3_x64) + * [Arma 3 Headless Client](/steamcmd_servers/arma/arma3_headless_client) * [Avorion](/steamcmd_servers/avorion) * [Assetto Corsa](/steamcmd_servers/assetto_corsa) * [Barotrauma](/steamcmd_servers/barotrauma) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index ce8fac38..328b2f92 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -11,8 +11,8 @@ This is a collection of servers that use SteamCMD to install. ## Arma [Arma](arma) * [Arma 3](arma/arma3) -* [Arma 3 HC](arma/arma3_headless_client) -* [Arma 3 HC](arma/arma3_x64)) +* [Arma 3 64 Bit](arma/arma3_x64) +* [Arma 3 Headless Client](arma/arma3_headless_client) ## Avorion [Avorion](avorion) diff --git a/steamcmd_servers/arma/README.md b/steamcmd_servers/arma/README.md index f90116a9..15e5389c 100644 --- a/steamcmd_servers/arma/README.md +++ b/steamcmd_servers/arma/README.md @@ -2,8 +2,7 @@ ARMA is a series of first-person tactical military shooters, originally released for Microsoft Windows. It features large elements of realism and simulation; a blend of large-scale military conflict spread across large areas alongside the more close quartered battles. -## ARMA III -[arma 3](arma3/) - -## ARMA III headless client -[arma 3 headless](arma3_headless_client/) \ No newline at end of file +## Arma 3 +* [Arma 3](arma3) +* [Arma 3 64 Bit](arma3_x64) +* [Arma 3 Headless Client](arma3_headless_client) \ No newline at end of file From 3e8de156809e39468e43ca2abd15012230aff66c Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:59:58 -0500 Subject: [PATCH 19/26] The forest readme Adds the forest to main readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 896fcecf..e9188162 100644 --- a/README.md +++ b/README.md @@ -173,6 +173,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Stationeers](/steamcmd_servers/stationeers) * [Stormworks: Build and Rescue](/steamcmd_servers/stormworks) * [Sven Co-op](/steamcmd_servers/svencoop) +* [The Forest](/steamcmd_servers/the_forest) * [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic) * [Unturned](/steamcmd_servers/unturned) From da2e1db1530c9f10b4a075bea46d2d895f3b01fe Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:11:34 -0500 Subject: [PATCH 20/26] Update README.md oops --- minecraft/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/README.md b/minecraft/README.md index 80786938..e1f79035 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -35,4 +35,4 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) - * DragonProxy abandoned in favour of GeyserMC. + * DragonProxy abandoned in favour of GeyserMC. From 0433f7d4fda2756842a0c32516f3a04943dad991 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:14:21 -0500 Subject: [PATCH 21/26] Update README.md Direct links into the Mohist git repo to keep it consistent with others --- minecraft/java/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/java/README.md b/minecraft/java/README.md index eb83be7e..78b2f595 100644 --- a/minecraft/java/README.md +++ b/minecraft/java/README.md @@ -68,7 +68,7 @@ Purpur is a fork of Paper and Tuinity with the goal of providing new and interes This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar. - (It's noted that building the jar is intensive and time consuming) -[Mohist Github](https://github.com/Mohist-Community) +[Mohist Github](https://github.com/Mohist-Community/Mohist) Fork of Spigot focused on performance optimizations. [Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) From b7a82e9faefc7d73bdf2b7fcef746b7e692c4cb3 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:16:51 -0500 Subject: [PATCH 22/26] Update README.md Alphabetical reordering fixed and made the daemon importing egg warning a little more clear. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e9188162..595f80b4 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you are reading this it looks like you are looking to add an egg to your serv 5. Select what nest you want to put the egg in. 1. If you want a new nest you need to create it before importing the egg. -# You must restart your daemon after importing an egg if you are using 0.7, this is not required on 1.X. +# You must restart your daemon after importing an egg if you are using 0.7. This is not required on 1.X. ## Please read the CONTRIBUTING.md before submitting PRs @@ -39,6 +39,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Redbot](/bots/discord/redbot) Python * [SinusBot](/bots/discord/sinusbot) +[Other](/bots/other) +* [Big Brother Bot](/bots/other/bigbrotherbot) + [Twitch](/bots/twitch) * [PhantomBot](/bots/twitch/phantombot) * [SogeBot](/bots/twitch/sogebot) @@ -46,9 +49,6 @@ If you are reading this it looks like you are looking to add an egg to your serv [TeamSpeak3](bots/teamspeak3) * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) -[Other](/bots/other) -* [Big Brother Bot](/bots/other/bigbrotherbot) - ## [Database](/database) ### In-Memory Databases [Redis](/database/redis) From 364b200e7c56cd76181f87fd4b79df009b707c27 Mon Sep 17 00:00:00 2001 From: Omar Kamel <30291302+TekExplorer@users.noreply.github.com> Date: Wed, 6 Jan 2021 17:07:55 -0500 Subject: [PATCH 23/26] re-order images to place latest (nodejs 14) first --- bots/discord/discord.js/egg-discord-js-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index 42c60cdf..db63abb6 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -9,9 +9,9 @@ "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12", "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-10", + "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-14", "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12", - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-14" + "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-10" ], "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install --production; fi; \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}}", "config": { From e6e5c74c228cf76e453c609076d745a6998db287 Mon Sep 17 00:00:00 2001 From: Omar Kamel <30291302+TekExplorer@users.noreply.github.com> Date: Wed, 6 Jan 2021 17:10:43 -0500 Subject: [PATCH 24/26] edit comment to say python instead of nodejs --- bots/discord/discord.py/egg-discord-py-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/bots/discord/discord.py/egg-discord-py-generic.json index 9d37bd7e..971bc3f9 100644 --- a/bots/discord/discord.py/egg-discord-py-generic.json +++ b/bots/discord/discord.py/egg-discord-py-generic.json @@ -21,7 +21,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# NodeJS Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [[ ! \"${USERNAME}\" == \"\" ]]; then\r\n if [[ ! https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git | sed 's:\/*$::')\r\n INSTALL_REPO=\"https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\"\r\n fi\r\n \r\n echo -e \"working on installing a discord.js bot from https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\"\r\n \r\n if [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n \techo -e \"assuming user knows what they are doing have a good day.\"\r\n \texit 0\r\n else\r\n \tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n \t\techo -e \"\/mnt\/server directory is not empty.\"\r\n \t if [ -d .git ]; then\r\n \t\t\techo -e \".git directory exists\" \r\n \t\t\tif [ -f .git\/config ]; then\r\n \t\t\t\techo -e \"loading info from git config\"\r\n \t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n \t\t\telse\r\n \t\t\t\techo -e \"files found with no git config\"\r\n \t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n \t\t\t\texit 10\r\n \t\t\tfi\r\n \t\tfi\r\n \t\tif [ \"${ORIGIN}\" == \"https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\" ]; then\r\n \t\t\techo \"pulling latest from github\"\r\n \t\t\tgit pull \r\n \t\tfi\r\n \telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n \t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n \t\t\techo -e \"assuming master branch\"\r\n \t\t\tINSTALL_BRANCH=master\r\n \t\tfi\r\n \r\n \t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git .'\"\r\n \t\tgit clone --single-branch --branch ${INSTALL_BRANCH} https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git .\r\n \tfi\r\n fi \r\nelse\r\n if [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\n fi\r\n \r\n echo -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n \r\n if [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n \techo -e \"assuming user knows what they are doing have a good day.\"\r\n \texit 0\r\n else\r\n \tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n \t\techo -e \"\/mnt\/server directory is not empty.\"\r\n \t if [ -d .git ]; then\r\n \t\t\techo -e \".git directory exists\" \r\n \t\t\tif [ -f .git\/config ]; then\r\n \t\t\t\techo -e \"loading info from git config\"\r\n \t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n \t\t\telse\r\n \t\t\t\techo -e \"files found with no git config\"\r\n \t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n \t\t\t\texit 10\r\n \t\t\tfi\r\n \t\tfi\r\n \t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n \t\t\techo \"pulling latest from github\"\r\n \t\t\tgit pull \r\n \t\tfi\r\n \telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n \t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n \t\t\techo -e \"assuming master branch\"\r\n \t\t\tINSTALL_BRANCH=master\r\n \t\tfi\r\n \r\n \t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n \t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n \tfi\r\n fi \r\nfi\r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --target \/mnt\/server\/ ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --target \/mnt\/server\/ -r requirements.txt\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#!\/bin\/bash\r\n# Python Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [[ ! \"${USERNAME}\" == \"\" ]]; then\r\n if [[ ! https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git | sed 's:\/*$::')\r\n INSTALL_REPO=\"https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\"\r\n fi\r\n \r\n echo -e \"working on installing a discord.js bot from https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\"\r\n \r\n if [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n \techo -e \"assuming user knows what they are doing have a good day.\"\r\n \texit 0\r\n else\r\n \tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n \t\techo -e \"\/mnt\/server directory is not empty.\"\r\n \t if [ -d .git ]; then\r\n \t\t\techo -e \".git directory exists\" \r\n \t\t\tif [ -f .git\/config ]; then\r\n \t\t\t\techo -e \"loading info from git config\"\r\n \t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n \t\t\telse\r\n \t\t\t\techo -e \"files found with no git config\"\r\n \t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n \t\t\t\texit 10\r\n \t\t\tfi\r\n \t\tfi\r\n \t\tif [ \"${ORIGIN}\" == \"https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\" ]; then\r\n \t\t\techo \"pulling latest from github\"\r\n \t\t\tgit pull \r\n \t\tfi\r\n \telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n \t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n \t\t\techo -e \"assuming master branch\"\r\n \t\t\tINSTALL_BRANCH=master\r\n \t\tfi\r\n \r\n \t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git .'\"\r\n \t\tgit clone --single-branch --branch ${INSTALL_BRANCH} https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git .\r\n \tfi\r\n fi \r\nelse\r\n if [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\n fi\r\n \r\n echo -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n \r\n if [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n \techo -e \"assuming user knows what they are doing have a good day.\"\r\n \texit 0\r\n else\r\n \tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n \t\techo -e \"\/mnt\/server directory is not empty.\"\r\n \t if [ -d .git ]; then\r\n \t\t\techo -e \".git directory exists\" \r\n \t\t\tif [ -f .git\/config ]; then\r\n \t\t\t\techo -e \"loading info from git config\"\r\n \t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n \t\t\telse\r\n \t\t\t\techo -e \"files found with no git config\"\r\n \t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n \t\t\t\texit 10\r\n \t\t\tfi\r\n \t\tfi\r\n \t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n \t\t\techo \"pulling latest from github\"\r\n \t\t\tgit pull \r\n \t\tfi\r\n \telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n \t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n \t\t\techo -e \"assuming master branch\"\r\n \t\t\tINSTALL_BRANCH=master\r\n \t\tfi\r\n \r\n \t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n \t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n \tfi\r\n fi \r\nfi\r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --target \/mnt\/server\/ ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --target \/mnt\/server\/ -r requirements.txt\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "python:3.8-slim", "entrypoint": "bash" } @@ -100,4 +100,4 @@ "rules": "nullable|string|max:128" } ] -} \ No newline at end of file +} From 2b3fe08a30f372e358d79a06d58c2d3c70ff7add Mon Sep 17 00:00:00 2001 From: Omar Kamel <30291302+TekExplorer@users.noreply.github.com> Date: Wed, 6 Jan 2021 17:11:34 -0500 Subject: [PATCH 25/26] change instances of discord.js to discord.py --- bots/discord/discord.py/egg-discord-py-generic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/bots/discord/discord.py/egg-discord-py-generic.json index 971bc3f9..7a3f3692 100644 --- a/bots/discord/discord.py/egg-discord-py-generic.json +++ b/bots/discord/discord.py/egg-discord-py-generic.json @@ -21,7 +21,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Python Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [[ ! \"${USERNAME}\" == \"\" ]]; then\r\n if [[ ! https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git | sed 's:\/*$::')\r\n INSTALL_REPO=\"https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\"\r\n fi\r\n \r\n echo -e \"working on installing a discord.js bot from https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\"\r\n \r\n if [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n \techo -e \"assuming user knows what they are doing have a good day.\"\r\n \texit 0\r\n else\r\n \tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n \t\techo -e \"\/mnt\/server directory is not empty.\"\r\n \t if [ -d .git ]; then\r\n \t\t\techo -e \".git directory exists\" \r\n \t\t\tif [ -f .git\/config ]; then\r\n \t\t\t\techo -e \"loading info from git config\"\r\n \t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n \t\t\telse\r\n \t\t\t\techo -e \"files found with no git config\"\r\n \t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n \t\t\t\texit 10\r\n \t\t\tfi\r\n \t\tfi\r\n \t\tif [ \"${ORIGIN}\" == \"https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\" ]; then\r\n \t\t\techo \"pulling latest from github\"\r\n \t\t\tgit pull \r\n \t\tfi\r\n \telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n \t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n \t\t\techo -e \"assuming master branch\"\r\n \t\t\tINSTALL_BRANCH=master\r\n \t\tfi\r\n \r\n \t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git .'\"\r\n \t\tgit clone --single-branch --branch ${INSTALL_BRANCH} https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git .\r\n \tfi\r\n fi \r\nelse\r\n if [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\n fi\r\n \r\n echo -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n \r\n if [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n \techo -e \"assuming user knows what they are doing have a good day.\"\r\n \texit 0\r\n else\r\n \tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n \t\techo -e \"\/mnt\/server directory is not empty.\"\r\n \t if [ -d .git ]; then\r\n \t\t\techo -e \".git directory exists\" \r\n \t\t\tif [ -f .git\/config ]; then\r\n \t\t\t\techo -e \"loading info from git config\"\r\n \t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n \t\t\telse\r\n \t\t\t\techo -e \"files found with no git config\"\r\n \t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n \t\t\t\texit 10\r\n \t\t\tfi\r\n \t\tfi\r\n \t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n \t\t\techo \"pulling latest from github\"\r\n \t\t\tgit pull \r\n \t\tfi\r\n \telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n \t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n \t\t\techo -e \"assuming master branch\"\r\n \t\t\tINSTALL_BRANCH=master\r\n \t\tfi\r\n \r\n \t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n \t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n \tfi\r\n fi \r\nfi\r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --target \/mnt\/server\/ ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --target \/mnt\/server\/ -r requirements.txt\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#!\/bin\/bash\r\n# Python Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [[ ! \"${USERNAME}\" == \"\" ]]; then\r\n if [[ ! https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git | sed 's:\/*$::')\r\n INSTALL_REPO=\"https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\"\r\n fi\r\n \r\n echo -e \"working on installing a discord.py bot from https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\"\r\n \r\n if [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n \techo -e \"assuming user knows what they are doing have a good day.\"\r\n \texit 0\r\n else\r\n \tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n \t\techo -e \"\/mnt\/server directory is not empty.\"\r\n \t if [ -d .git ]; then\r\n \t\t\techo -e \".git directory exists\" \r\n \t\t\tif [ -f .git\/config ]; then\r\n \t\t\t\techo -e \"loading info from git config\"\r\n \t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n \t\t\telse\r\n \t\t\t\techo -e \"files found with no git config\"\r\n \t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n \t\t\t\texit 10\r\n \t\t\tfi\r\n \t\tfi\r\n \t\tif [ \"${ORIGIN}\" == \"https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git\" ]; then\r\n \t\t\techo \"pulling latest from github\"\r\n \t\t\tgit pull \r\n \t\tfi\r\n \telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n \t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n \t\t\techo -e \"assuming master branch\"\r\n \t\t\tINSTALL_BRANCH=master\r\n \t\tfi\r\n \r\n \t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git .'\"\r\n \t\tgit clone --single-branch --branch ${INSTALL_BRANCH} https:\/\/${USERNAME}:${PASSWORD}@github.com\/${INSTALL_REPO}.git .\r\n \tfi\r\n fi \r\nelse\r\n if [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\n fi\r\n \r\n echo -e \"working on installing a discord.py bot from ${INSTALL_REPO}\"\r\n \r\n if [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n \techo -e \"assuming user knows what they are doing have a good day.\"\r\n \texit 0\r\n else\r\n \tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n \t\techo -e \"\/mnt\/server directory is not empty.\"\r\n \t if [ -d .git ]; then\r\n \t\t\techo -e \".git directory exists\" \r\n \t\t\tif [ -f .git\/config ]; then\r\n \t\t\t\techo -e \"loading info from git config\"\r\n \t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n \t\t\telse\r\n \t\t\t\techo -e \"files found with no git config\"\r\n \t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n \t\t\t\texit 10\r\n \t\t\tfi\r\n \t\tfi\r\n \t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n \t\t\techo \"pulling latest from github\"\r\n \t\t\tgit pull \r\n \t\tfi\r\n \telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n \t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n \t\t\techo -e \"assuming master branch\"\r\n \t\t\tINSTALL_BRANCH=master\r\n \t\tfi\r\n \r\n \t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n \t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n \tfi\r\n fi \r\nfi\r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --target \/mnt\/server\/ ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --target \/mnt\/server\/ -r requirements.txt\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "python:3.8-slim", "entrypoint": "bash" } From 3cc43d99fe0f92663e34ab40c12f5e5f766b92fb Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 7 Jan 2021 16:07:57 -0500 Subject: [PATCH 26/26] Manually setting port no longer needed. The port is now set via the startup command, not only through commands. --- mindustry/README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mindustry/README.md b/mindustry/README.md index 312bd1c7..b47636ed 100644 --- a/mindustry/README.md +++ b/mindustry/README.md @@ -1,10 +1,5 @@ # Mindustry -**PLEASE READ** -Due to Mindustry not accepting command line arguments you MUST set the port once you start the game, by using the command `port `. - -This only has to be done once. - #### About the game Mindustry is a hybrid tower-defense sandbox factory game. Create elaborate supply chains of conveyor belts to feed ammo into your turrets, produce materials to use for building, and defend your structures from waves of enemies. Features include a map editor, 24 built-in maps, cross-platform multiplayer and large-scale PvP unit battles.