diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index ca5a84e08b..b0335e8990 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -42,6 +42,7 @@ jobs: - name: Login to GitHub Container Registry uses: docker/login-action@v2 + if: "github.event_name != 'pull_request'" with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -55,7 +56,7 @@ jobs: sed -i "s/ 'version' => 'canary',/ 'version' => '${REF:1}',/" config/app.php - name: Build and Push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: context: . file: ./Dockerfile diff --git a/database/Seeders/eggs/rust/egg-rust.json b/database/Seeders/eggs/rust/egg-rust.json index 9b24e9148a..b3a49e8f56 100644 --- a/database/Seeders/eggs/rust/egg-rust.json +++ b/database/Seeders/eggs/rust/egg-rust.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2023-02-04T14:45:12-05:00", + "exported_at": "2023-03-25T13:37:00+00:00", "name": "Rust", "author": "support@pterodactyl.io", "description": "Rust(腐蚀) 一款尽一切努力生存的游戏。为此,您需要克服饥饿、干渴和寒冷等风险。建立庇护所。杀死动物以获取肉。保护自己免受其他玩家的攻击,甚至是朋友的背叛。与其他玩家建立联盟并组建城镇。尽一切努力生存吧。", @@ -41,13 +41,13 @@ "field_type": "text" }, { - "name": "OxideMod", - "description": "设置您是否希望服务器使用并自动更新 OxideMod。有效选项是 \"1\" 代表 true,\"0\" 代表 false。", - "env_variable": "OXIDE", - "default_value": "0", + "name": "模组框架", + "description": "可以使用的模组框架: carbon, oxide, vanilla.\r\n对于非模组的,服务器默认安装\"vanilla\"", + "env_variable": "FRAMEWORK", + "default_value": "vanilla", "user_viewable": true, "user_editable": true, - "rules": "required|boolean", + "rules": "required|in:carbon,oxide,vanilla", "field_type": "text" }, { @@ -120,6 +120,16 @@ "rules": "nullable|url", "field_type": "text" }, + { + "name": "查询端口", + "description": "服务器查询端口。不能与游戏的主端口相同。", + "env_variable": "QUERY_PORT", + "default_value": "27017", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer", + "field_type": "text" + }, { "name": "RCON 端口", "description": "RCON 连接的端口。", @@ -189,16 +199,6 @@ "user_editable": true, "rules": "nullable|url", "field_type": "text" - }, - { - "name": "查询端口", - "description": "服务器查询端口。不能与游戏的主端口相同。", - "env_variable": "QUERY_PORT", - "default_value": "27017", - "user_viewable": true, - "user_editable": false, - "rules": "required|integer", - "field_type": "text" } ] }