Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Author: DaneEveritt

app/Services/Nodes/NodeCreationService.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Services\Nodes;
 
+use Ramsey\Uuid\Uuid;
 use Illuminate\Support\Str;
 use Pterodactyl\Models\Node;
 use Illuminate\Encryption\Encrypter;
@@ -41,6 +42,7 @@ public function __construct(Encrypter $encrypter, NodeRepositoryInterface $repos
      */
     public function handle(array $data)
     {
+        $data['uuid'] = Uuid::uuid4()->toString();
         $data['daemon_token'] = $this->encrypter->encrypt(Str::random(Node::DAEMON_TOKEN_LENGTH));
         $data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH);
 

resources/scripts/components/server/ServerConsole.tsx

@@ -110,7 +110,7 @@ export default () => {
                             className={'mr-1'}
                         />
                          {bytesToHuman(memory)}
-                        <span className={'text-neutral-500'}>/ {server.limits.memory} MB</span>
+                        <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>
                     </p>
                     <p className={'text-xs mt-2'}>
                         <FontAwesomeIcon
@@ -119,7 +119,7 @@ export default () => {
                             className={'mr-1'}
                         />
                         &nbsp;{bytesToHuman(disk)}
-                        <span className={'text-neutral-500'}>/ {server.limits.disk} MB</span>
+                        <span className={'text-neutral-500'}> / {server.limits.disk} MB</span>
                     </p>
                 </TitledGreyBox>
                 <Can action={[ 'control.start', 'control.stop', 'control.restart' ]} matchAny={true}>