Merge branch 'develop' into feature/new-theme

# Conflicts:
#	.gitignore
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
#	public/themes/pterodactyl/js/frontend/serverlist.js
#	resources/themes/pterodactyl/server/files/list.blade.php

resources/lang/en/auth.php

@@ -15,4 +15,6 @@ return [
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
     'password_requirements' => 'Passwords must contain at least one uppercase, lowecase, and numeric character and must be at least 8 characters in length.',
     'request_reset' => 'Locate Account',
+    '2fa_required' => '2-Factor Authentication',
+    '2fa_failed' => 'The 2FA token provided was invalid.',
 ];

resources/lang/en/strings.php

@@ -2,6 +2,7 @@
 
 return [
     'email' => 'Email',
+    'user_identifier' => 'Username or Email',
     'password' => 'Password',
     'confirm_password' => 'Confirm Password',
     'login' => 'Login',
@@ -60,4 +61,6 @@ return [
     'no' => 'No',
     'delete' => 'Delete',
     '2fa' => '2FA',
+    'logout' => 'Logout',
+    'admin_cp' => 'Admin Control Panel',
 ];