Merge pull request pterodactyl#2637 from AreYouRlyScared/fix2434

Fixes for PR#2434

Author: DaneEveritt

app/Http/Requests/Admin/Settings/AdvancedSettingsFormRequest.php

@@ -19,8 +19,6 @@ public function rules()
             'recaptcha:website_key' => 'required|string|max:191',
             'pterodactyl:guzzle:timeout' => 'required|integer|between:1,60',
             'pterodactyl:guzzle:connect_timeout' => 'required|integer|between:1,60',
-            'pterodactyl:console:count' => 'required|integer|min:1',
-            'pterodactyl:console:frequency' => 'required|integer|min:10',
             'pterodactyl:client_features:allocations:enabled' => 'required|in:true,false',
             'pterodactyl:client_features:allocations:range_start' => 'required|integer|between:1024,65535',
             'pterodactyl:client_features:allocations:range_end' => 'required|integer|between:1024,65535',
@@ -38,8 +36,6 @@ public function attributes()
             'recaptcha:website_key' => 'reCAPTCHA Website Key',
             'pterodactyl:guzzle:timeout' => 'HTTP Request Timeout',
             'pterodactyl:guzzle:connect_timeout' => 'HTTP Connection Timeout',
-            'pterodactyl:console:count' => 'Console Message Count',
-            'pterodactyl:console:frequency' => 'Console Frequency Tick',
             'pterodactyl:client_features:allocations:enabled' => 'Auto Create Allocations Enabled',
             'pterodactyl:client_features:allocations:range_start' => 'Starting Port',
             'pterodactyl:client_features:allocations:range_end' => 'Ending Port',

config/app.php

@@ -9,7 +9,7 @@
     | change this value if you are not maintaining your own internal versions.
     */
 
-    'version' => '1.0.1',
+    'version' => 'canary',
 
     /*
     |--------------------------------------------------------------------------

resources/views/admin/settings/advanced.blade.php

@@ -82,29 +82,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="box">
-                    <div class="box-header with-border">
-                        <h3 class="box-title">Console</h3>
-                    </div>
-                    <div class="box-body">
-                        <div class="row">
-                            <div class="form-group col-md-6">
-                                <label class="control-label">Message Count</label>
-                                <div>
-                                    <input type="number" required class="form-control" name="pterodactyl:console:count" value="{{ old('pterodactyl:console:count', config('pterodactyl.console.count')) }}">
-                                    <p class="text-muted small">The number of messages to be pushed to the console per frequency tick.</p>
-                                </div>
-                            </div>
-                            <div class="form-group col-md-6">
-                                <label class="control-label">Frequency Tick</label>
-                                <div>
-                                    <input type="number" required class="form-control" name="pterodactyl:console:frequency" value="{{ old('pterodactyl:console:frequency', config('pterodactyl.console.frequency')) }}">
-                                    <p class="text-muted small">The amount of time in milliseconds between each console message sending tick.</p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">Automatic Allocation Creation</h3>