Merge branch 'develop' into hidedelifown

resources/scripts/components/dashboard/forms/UpdatePasswordForm.tsx

@@ -77,7 +77,7 @@ export default () => {
                                 </div>
                                 <div css={tw`mt-6`}>
                                     <Field
-                                        id={'confirm_password'}
+                                        id={'confirm_new_password'}
                                         type={'password'}
                                         name={'confirmPassword'}
                                         label={'Confirm New Password'}

resources/scripts/components/server/Console.tsx

@@ -3,6 +3,7 @@ import { ITerminalOptions, Terminal } from 'xterm';
 import { FitAddon } from 'xterm-addon-fit';
 import { SearchAddon } from 'xterm-addon-search';
 import { SearchBarAddon } from 'xterm-addon-search-bar';
+import { WebLinksAddon } from 'xterm-addon-web-links';
 import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
 import { ServerContext } from '@/state/server';
 import styled from 'styled-components/macro';
@@ -62,6 +63,7 @@ export default () => {
     const fitAddon = new FitAddon();
     const searchAddon = new SearchAddon();
     const searchBar = new SearchBarAddon({ searchAddon });
+    const webLinksAddon = new WebLinksAddon();
     const { connected, instance } = ServerContext.useStoreState(state => state.socket);
     const [ canSendCommands ] = usePermissions([ 'control.console' ]);
     const serverId = ServerContext.useStoreState(state => state.server.data!.id);
@@ -115,6 +117,7 @@ export default () => {
             terminal.loadAddon(fitAddon);
             terminal.loadAddon(searchAddon);
             terminal.loadAddon(searchBar);
+            terminal.loadAddon(webLinksAddon);
             fitAddon.fit();
 
             // Add support for capturing keys

resources/scripts/components/server/databases/CreateDatabaseButton.tsx

@@ -24,7 +24,7 @@ const schema = object().shape({
         .matches(/^[A-Za-z0-9_\-.]{3,48}$/, 'Database name should only contain alphanumeric characters, underscores, dashes, and/or periods.'),
     connectionsFrom: string()
         .required('A connection value must be provided.')
-        .matches(/^([1-9]{1,3}|%)(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?$/, 'A valid connection address must be provided.'),
+        .matches(/^([0-9]{1,3}|%)(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?$/, 'A valid connection address must be provided.'),
 });
 
 export default () => {

resources/scripts/components/server/databases/DatabaseRow.tsx

@@ -131,7 +131,7 @@ export default ({ database, className }: Props) => {
                     </div>
                 </Can>
                 <div css={tw`mt-6`}>
-                    <Label>JBDC Connection String</Label>
+                    <Label>JDBC Connection String</Label>
                     <CopyOnClick text={`jdbc:mysql://${database.username}:${database.password}@${database.connectionString}/${database.name}`}>
                         <Input
                             type={'text'}

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

@@ -62,7 +62,7 @@ const EulaModalFeature = () => {
             :
             <Modal visible onDismissed={() => setVisible(false)} closeOnBackground={false} showSpinnerOverlay={loading}>
                 <FlashMessageRender key={'feature:eula'} css={tw`mb-4`}/>
-                <h2 css={tw`text-2xl mb-4 text-neutral-100`}>Accept Minecraft® EULA</h2>
+                <h2 css={tw`text-2xl mb-4 text-neutral-100`}>Accept Minecraft&reg; EULA</h2>
                 <p css={tw`text-neutral-200`}>
                     By pressing {'"I Accept"'} below you are indicating your agreement to the&nbsp;
                     <a
@@ -71,7 +71,7 @@ const EulaModalFeature = () => {
                         rel={'noreferrer noopener'}
                         href="https://account.mojang.com/documents/minecraft_eula"
                     >
-                        Mojang EULA
+                        Minecraft&reg; EULA
                     </a>.
                 </p>
                 <div css={tw`mt-8 sm:flex items-center justify-end`}>

resources/scripts/components/server/schedules/TaskDetailsModal.tsx

@@ -91,7 +91,7 @@ const TaskDetailsForm = ({ isEditingTask }: { isEditingTask: boolean }) => {
                             <Label>Ignored Files</Label>
                             <FormikFieldWrapper
                                 name={'payload'}
-                                description={'Optional. Include the files and folders to be excluded in this backup. By default, the contents of your .pteroignore file will be used.'}
+                                description={'Optional. Include the files and folders to be excluded in this backup. By default, the contents of your .pteroignore file will be used. If you have reached your backup limit, the oldest backup will be rotated.'}
                             >
                                 <FormikField as={Textarea} name={'payload'} rows={6} />
                             </FormikFieldWrapper>

resources/views/admin/nodes/view/index.blade.php

@@ -51,7 +51,7 @@
                                 <td data-attr="info-system"><i class="fa fa-refresh fa-fw fa-spin"></i></td>
                             </tr>
                             <tr>
-                                <td>Total CPU Cores</td>
+                                <td>Total CPU Threads</td>
                                 <td data-attr="info-cpus"><i class="fa fa-refresh fa-fw fa-spin"></i></td>
                             </tr>
                         </table>