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

Author: DaneEveritt

resources/scripts/components/server/PowerControls.tsx

@@ -49,7 +49,7 @@ const PowerControls = () => {
                 <StopOrKillButton onPress={action => sendPowerCommand(action)}/>
             </Can>
         </div>
-    )
+    );
 };
 
 export default PowerControls;

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

@@ -81,7 +81,7 @@ export default ({ schedule, task }: Props) => {
                 <div css={tw`md:ml-6 mt-2`}>
                     {task.action === 'backup' &&
                     <p css={tw`text-xs uppercase text-neutral-400 mb-1`}>Ignoring files & folders:</p>}
-                    <div css={tw`font-mono bg-neutral-800 rounded py-1 px-2 text-sm w-auto whitespace-pre inline-block break-all`}>
+                    <div css={tw`font-mono bg-neutral-800 rounded py-1 px-2 text-sm w-auto inline-block whitespace-pre-wrap break-all`}>
                         {task.payload}
                     </div>
                 </div>

resources/views/admin/servers/new.blade.php

@@ -158,7 +158,7 @@
                     </div>
 
                     <div class="form-group col-xs-6">
-                        <label for="pThreads">CPU Threads</label>
+                        <label for="pThreads">CPU Pinning</label>
 
                         <div>
                             <input type="text" id="pThreads" name="threads" class="form-control" value="{{ old('threads') }}" />

resources/views/admin/servers/view/build.blade.php

@@ -38,7 +38,7 @@
                         <p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
                     </div>
                     <div class="form-group">
-                        <label for="threads" class="control-label">CPU Threads</label>
+                        <label for="threads" class="control-label">CPU Pinning</label>
                         <div>
                             <input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
                         </div>

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

@@ -68,7 +68,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td>CPU Threads</td>
+                                <td>CPU Pinning</td>
                                 <td>
                                     @if($server->threads != null)
                                         <code>{{ $server->threads }}</code>