Merge branch 'master' into add/reposilite

TheTwoBoom · May 4, 2022 · 9d0ea53 · 9d0ea53
2 parents 019536f + 09c56d3
commit 9d0ea53
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -304,6 +304,9 @@ If you are reading this it looks like you are looking to add an egg to your serv
 
 * [rabbitmq](/software/rabbitmq)
 
+### 5e Tools
+* [5e Tools](/software/5e-tools)
+
 ### Reposilite
 
 * [Reposilite](/software/reposilite)
diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json
@@ -8,7 +8,7 @@
     "author": "[email protected]",
     "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:db_mongo-4",
-    "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --auth --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}",
+    "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}",
     "config": {
         "files": "{}",
         "startup": "{\r\n    \"done\": \"child process started successfully\"\r\n}",

diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md
@@ -13,39 +13,39 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains,
 
 ## [Java](java) Servers for Java Minecraft
 
-* [Airplane](minecraft/java/airplane)
-* [Cuberite](minecraft/java/cuberite)
-* [Fabric](minecraft/java/fabric)
-* [Feather](minecraft/java/feather)
-* [Forge](minecraft/java/forge)
-  * [Forge](minecraft/java/forge/forge)
-  * [CusreForge Generic](minecraft/java/forge/curseforge-generic)
-* [Feed The Beast](minecraft/java/ftb)
-* [Glowstone](/minecraft/java/glowstone)
-* [Krypton](/minecraft/java/krypton)
-* [Magma](minecraft/java/magma)
-* [Mohist](minecraft/java/mohist)
-* [NanoLimbo](/minecraft/java/nanolimbo)
-* [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)
+* [Airplane](java/airplane)
+* [Cuberite](java/cuberite)
+* [Fabric](java/fabric)
+* [Feather](java/feather)
+* [Forge](java/forge)
+  * [Forge](java/forge/forge)
+  * [CusreForge Generic](java/forge/curseforge-generic)
+* [Feed The Beast](java/ftb)
+* [Glowstone](java/glowstone)
+* [Krypton](java/krypton)
+* [Magma](java/magma)
+* [Mohist](java/mohist)
+* [NanoLimbo](java/nanolimbo)
+* [Paper](java/paper)
+* [Purpur](java/purpur)
+* [Spigot](java/spigot)
+* [SpongeForge](java/spongeforge)
+* [SpongeVanilla](/java/spongevanilla)
+* [Technic](java/technic)
+* [Tuinity](java/tuinity)
+* [VanillaCord](java/vanillacord)
 
 ## [Proxies](proxy) Minecraft Server Proxies
 
-* [Bedrock](minecraft/proxy/bedrock)
-  * [Waterdog PE](minecraft/proxy/bedrock/waterdog_pe)
-* [Cross Platform](minecraft/proxy/cross_platform)
-  * [GeyserMC](minecraft/proxy/cross_platform/geyser)
-  * [Waterdog](minecraft/proxy/cross_platform/waterdog)
-* [Java](minecraft/proxy/java)
-  * [FlameCord](minecraft/proxy/java/flamecord)
-  * [Travertine](minecraft/proxy/java/travertine)
-  * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo)
-  * [Velocity](minecraft/proxy/java/velocity)
-  * [VIAaas](minecraft/proxy/java/viaaas)
-  * [Waterfall](minecraft/proxy/java/waterfall)
+* [Bedrock](proxy/bedrock)
+  * [Waterdog PE](proxy/bedrock/waterdog_pe)
+* [Cross Platform](proxy/cross_platform)
+  * [GeyserMC](proxy/cross_platform/geyser)
+  * [Waterdog](proxy/cross_platform/waterdog)
+* [Java](proxy/java)
+  * [FlameCord](proxy/java/flamecord)
+  * [Travertine](proxy/java/travertine)
+  * [TyphoonLimbo](proxy/java/typhoonlimbo)
+  * [Velocity](proxy/java/velocity)
+  * [VIAaas](proxy/java/viaaas)
+  * [Waterfall](proxy/java/waterfall)
diff --git a/game_eggs/minecraft/java/magma/README.md b/game_eggs/minecraft/java/magma/README.md
@@ -2,7 +2,7 @@
 
 Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.
 
-[Magma Website](https://magmefoundation.org/)
+[Magma Website](https://magmafoundation.org/)
 
 ## Server Ports
 

diff --git a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json
@@ -165,6 +165,15 @@
             "user_editable": true,
             "rules": "nullable|string"
         },
+        {
+            "name": "[Advanced] Optional Client-Side Mods",
+            "description": "A semicolon-separated list of optional mods to load into the keys folder, but not include in server's mod parameter. Useful for allowing clients to connect to the server with or without the mod loaded. Mods in this list must be in \"@workshopID\" form (ex. @123456789;@987654321;). These will also be included in Automatic Updates (if enabled).",
+            "env_variable": "OPTIONALMODS",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string"
+        },
         {
             "name": "[Advanced] Extra Flags for SteamCMD",
             "description": "[This will override \"Download Creator DLCs\" if used] Only used when checking for server updates, and typically used for grabbing beta builds. Example: -beta profiling -betapassword CautionSpecialProfilingAndTestingBranchArma3",

diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md
@@ -3,7 +3,7 @@
 ***Updating your Egg?**: Ensure any existing servers have the latest Startup Command, new Startup Variables are set, **and you reinstall server!***
 ___
 
-## Authors / Contributors
+### Authors / Contributors
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
@@ -77,22 +77,24 @@ ___
 - *[Experimental]* Max player configuration.
 - Autosave amount and interval configuration.
 - Disable crash reporting if desired.
+- Disable seasonal events if desired.
 - ...and other advanced networking and server branch configurable settings.
 
 ___
 
 ### Server Ports
 
-- Default server ports are listed below, but all three ports can be changed freely.
+- Default server ports are listed below, but all three ports can be changed freely (\*some exceptions apply below).
+    - All three ports must be unique; they cannot currently be shared on one port (this may change in the future).
+    - It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match).
 - **Note:** The Primary/Default/Game Port for your server in Pterodactyl will be Satisfactory's `-Port=????` game port, even though clients will **connect with the Query port**.
-- It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match).
 - ***All three ports are required to be open/allocated for normal server behavior!***
 
 | Port | Default (UDP) |
 |---------|---------|
 | **Game (Primary Port in Pterodactyl)** | 7777 |
 | Beacon | 15000 |
-| Server Query | 15777 |
+| Server Query (Port clients connect with) | 15777 |
 
 ___
 
@@ -126,7 +128,8 @@ ___
 ### Save Files
 
 An existing save file (including single-player saves) can currently be uploaded to the server via two different methods:
-- "Manage Saves" tab via a client in-game (Recommended)
+
+- "Manage Saves" tab via an admin client in-game (Recommended)
 - Manually via the File Manager or SFTP
 
 Save files are located in this directory:
@@ -149,12 +152,13 @@ ___
 
 ### Console Commands
 
-As of v0.5.1.2, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing.
+As of v0.5.1.10, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing.
 
 [List of known commands can be found via the Wiki.](https://satisfactory.fandom.com/wiki/Dedicated_servers#Console_commands)
+
 ___
 
-### Errors/Warnings
+### Known Errors/Warnings
 
 The following errors or warnings you see in the console can safely be ignored:
 
@@ -164,13 +168,13 @@ steamclient.so: cannot open shared object file: No such file or directory
 LogSteamShared: Warning: Steam Dedicated Server API failed to initialize.
 ```
 
-The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)).
+↑ The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)).
 
 ```log
 Warning: failed to init SDL thread priority manager: SDL not found
 ```
 
-This is a common error with Steam related software on Linux, but can safely be ignored.
+↑ This is a common error with Steam related software on Linux, but can safely be ignored.
 
 ```log
 ...Error: Couldn't find file for package...
@@ -188,4 +192,4 @@ This is a common error with Steam related software on Linux, but can safely be i
 LogStreaming: Warning: Failed to read file '../../../FactoryGame/Saved/SaveGames/GameAnalytics.sav' error.
 ```
 
-These seem to be common error messages with the current experimental version of the game.
+↑ These seem to be common error messages with the current experimental version of the game.
diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json
@@ -1,5 +1,5 @@
 {
-    "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2021-11-29",
+    "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2022-02-07",
     "meta": {
         "version": "PTDL_v1",
         "update_url": null
@@ -14,7 +14,7 @@
         "ghcr.io\/parkervcp\/games:source"
     ],
     "file_denylist": [],
-    "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0",
+    "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0 $(if {{DISABLE_SEASONAL}}; then echo \"-DisableSeasonalEvents\"; fi)",
     "config": {
         "files": "{\r\n    \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n        }\r\n    },\r\n    \"FactoryGame\/Saved\/Config\/LinuxServer\/Engine.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"mNumRotatingAutosaves\": \"mNumRotatingAutosaves={{server.build.env.NUM_AUTOSAVES}}\",\r\n            \"bImplicitSend\": \"bImplicitSend={{server.build.env.UPLOAD_CRASH_REPORT}}\",\r\n            \"InitialConnectTimeout\": \"InitialConnectTimeout={{server.build.env.INIT_CONNECT_TIMEOUT}}\",\r\n            \"ConnectionTimeout\": \"ConnectionTimeout={{server.build.env.CONNECT_TIMEOUT}}\"\r\n        }\r\n    },\r\n    \"FactoryGame\/Saved\/Config\/LinuxServer\/GameUserSettings.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"mFloatValues\": \"mFloatValues=((\\\"FG.AutosaveInterval\\\", {{server.build.env.AUTOSAVE_INTERVAL}}))\",\r\n            \"mIntValues\": \"mIntValues=((\\\"FG.NetworkQuality\\\", {{server.build.env.NETWORK_QUALITY}}))\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Engine Initialization\"\r\n}",
@@ -92,6 +92,15 @@
             "user_editable": true,
             "rules": "required|string|in:true,false"
         },
+        {
+            "name": "Disable Seasonal Events",
+            "description": "Accepted values are \"true\" or \"false\". Setting to \"true\" will disable any currently active seasonal events.",
+            "env_variable": "DISABLE_SEASONAL",
+            "default_value": "false",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
         {
             "name": "[Experimental] Max Players",
             "description": "[Requires server re-install to change default value!] The server and client are currently not optimized to support more than 4 players. However, you can override this value here at your own risk of poor performance.",