Merge branch '1.0-develop' into develop

README.md

@@ -1,6 +1,6 @@
 [![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io)
 
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/pterodactyl/panel/tests?label=Tests&style=for-the-badge)
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pterodactyl/panel/ci.yaml?label=Tests&style=for-the-badge&branch=1.0-develop)
 ![Discord](https://img.shields.io/discord/122900397965705216?label=Discord&logo=Discord&logoColor=white&style=for-the-badge)
 ![GitHub Releases](https://img.shields.io/github/downloads/pterodactyl/panel/latest/total?style=for-the-badge)
 ![GitHub contributors](https://img.shields.io/github/contributors/pterodactyl/panel?style=for-the-badge)

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -57,7 +57,7 @@ class EmailSettingsCommand extends Command
             $this->{$method}();
         }
 
-        $this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask(
+        $this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask(
             trans('command/messages.environment.mail.ask_mail_from'),
             $this->config->get('mail.from.address')
         );

app/Repositories/Wings/DaemonFileRepository.php

@@ -6,6 +6,7 @@ use Illuminate\Support\Arr;
 use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Server;
 use Psr\Http\Message\ResponseInterface;
+use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\TransferException;
 use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@@ -32,7 +33,7 @@ class DaemonFileRepository extends DaemonRepository
                     'query' => ['file' => $path],
                 ]
             );
-        } catch (TransferException $exception) {
+        } catch (ClientException|TransferException $exception) {
             throw new DaemonConnectionException($exception);
         }
 

resources/scripts/api/server/types.d.ts

@@ -1,4 +1,10 @@
-export type ServerStatus = 'installing' | 'install_failed' | 'suspended' | 'restoring_backup' | null;
+export type ServerStatus =
+    | 'installing'
+    | 'install_failed'
+    | 'reinstall_failed'
+    | 'suspended'
+    | 'restoring_backup'
+    | null;
 
 export interface ServerBackup {
     uuid: string;

resources/scripts/components/server/ConflictStateRenderer.tsx

@@ -11,7 +11,7 @@ export default () => {
         state => state.server.data?.isNodeUnderMaintenance || false,
     );
 
-    return status === 'installing' || status === 'install_failed' ? (
+    return status === 'installing' || status === 'install_failed' || status === 'reinstall_failed' ? (
         <ScreenBlock
             title={'Running Installer'}
             image={ServerInstallSvg}