Merge branch 'master' into markdown-formatting-changes

2022-02-19 09:20:49 -05:00
parent 5c9849a03a aaa1bc846a
commit 534e2238f0
116 changed files with 1345 additions and 482 deletions
--- a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json
+++ b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json
@@ -10,7 +10,8 @@
    "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.",
    "features": [
        "eula",
-        "java_version"
+        "java_version",
+        "pid_limit"
    ],
    "images": [
        "ghcr.io\/pterodactyl\/yolks:java_8",