Merge branch '1.0-develop' of https://mirror.ghproxy.com/https://gith…

…ub.com/pterodactyl/panel into 1.0-develop

CHANGELOG.md

@@ -3,6 +3,21 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v1.11.7
+
+### Added
+
+* Java 21 to Minecraft eggs
+
+### Changed
+
+* Updated Minecraft EULA link
+
+### Fixed
+
+* Fixed backups not ever being marked as completed (#5088)
+* Fixed `.7z` files not being detected as a compressed file (#5016)
+
 ## v1.11.6
 
 ### Changed

database/Seeders/eggs/minecraft/egg-bungeecord.json

@@ -4,7 +4,7 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2022-06-17T08:10:44+03:00",
+    "exported_at": "2024-05-07T12:55:57+00:00",
     "name": "Bungeecord",
     "author": "[email protected]",
     "description": "长期以来，Minecraft 服务器腐竹们一直梦想着以一种免费、简单且可靠的方式，将多个 Minecraft 服务器变成一个整体。而 BungeeCord！实现了大家的梦想。 无论您是希望将多个游戏模式串在一起的小型服务器，还是 ShotBow 网络的腐竹，BungeeCord 都是您的理想解决方案。在 BungeeCord 的帮助下，您社区的全部潜力将会释放。",
@@ -14,6 +14,7 @@
         "pid_limit"
     ],
     "docker_images": {
+        "Java 21": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_21",
         "Java 17": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_17",
         "Java 16": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_16",
         "Java 11": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_11",

database/Seeders/eggs/minecraft/egg-forge-minecraft.json

@@ -4,7 +4,7 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2022-11-06T06:33:01-05:00",
+    "exported_at": "2024-05-07T12:55:56+00:00",
     "name": "Forge Minecraft",
     "author": "[email protected]",
     "description": "Minecraft Forge 服务器。Minecraft Forge 是一个模组 API（应用程序编程接口），它可以更轻松地创建模组，并确保模组彼此兼容。",
@@ -14,6 +14,7 @@
         "pid_limit"
     ],
     "docker_images": {
+        "Java 21": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_21",
         "Java 17": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_17",
         "Java 16": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_16",
         "Java 11": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_11",

database/Seeders/eggs/minecraft/egg-paper.json

@@ -4,7 +4,7 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2022-06-17T08:11:30+03:00",
+    "exported_at": "2024-05-07T12:55:55+00:00",
     "name": "Paper",
     "author": "[email protected]",
     "description": "旨在修复游戏玩法和机制不一致的高性能 Spigot 分支。",
@@ -14,6 +14,7 @@
         "pid_limit"
     ],
     "docker_images": {
+        "Java 21": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_21",
         "Java 17": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_17",
         "Java 16": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_16",
         "Java 11": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_11",

database/Seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json

@@ -4,7 +4,7 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2022-06-17T08:11:42+03:00",
+    "exported_at": "2024-05-07T12:55:54+00:00",
     "name": "Sponge (SpongeVanilla)",
     "author": "[email protected]",
     "description": "SpongeVanilla 是建立在独立的原版 Minecraft 服务端上的 SpongeAPI 实现。",
@@ -14,6 +14,7 @@
         "pid_limit"
     ],
     "docker_images": {
+        "Java 21": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_21",
         "Java 16": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_16",
         "Java 11": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_11",
         "Java 8": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_8"

database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json

@@ -4,7 +4,7 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2022-06-17T08:11:58+03:00",
+    "exported_at": "2024-05-07T12:55:58+00:00",
     "name": "Vanilla Minecraft",
     "author": "[email protected]",
     "description": "Minecraft 是一款关于放置积木和进行冒险的游戏。探索随机生成的世界，建造从最简单的房屋到最宏伟的城堡。在创造模式下用无限资源的玩游戏，或在生存模式中深入挖掘，制作武器和盔甲以抵御危险的怪物。独自或与朋友一起探险这个世界吧！",
@@ -14,6 +14,7 @@
         "pid_limit"
     ],
     "docker_images": {
+        "Java 21": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_21",
         "Java 17": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_17",
         "Java 16": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_16",
         "Java 11": "registry.cn-shanghai.aliyuncs.com\/pterodactyl-china\/yolks:java_11",

resources/scripts/components/server/features/eula/EulaModalFeature.tsx

@@ -72,7 +72,7 @@ const EulaModalFeature = () => {
                     target={'_blank'}
                     css={tw`text-primary-300 underline transition-colors duration-150 hover:text-primary-400`}
                     rel={'noreferrer noopener'}
-                    href='https://account.mojang.com/documents/minecraft_eula'
+                    href='https://www.minecraft.net/eula'
                 >
                     Minecraft® EULA 协议
                 </a>。否则服务器将无法正常启动