Merge branch 'master' into 30FPS

I have to rebase because this conflicts with ARB and Macro JIT

src/yuzu/configuration/configure_debug.cpp

@@ -41,6 +41,8 @@ void ConfigureDebug::SetConfiguration() {
     ui->enable_graphics_debugging->setChecked(Settings::values.renderer_debug);
     ui->disable_macro_jit->setEnabled(!Core::System::GetInstance().IsPoweredOn());
     ui->disable_macro_jit->setChecked(Settings::values.disable_macro_jit);
+    ui->force_30fps_mode->setEnabled(!Core::System::GetInstance().IsPoweredOn());
+    ui->force_30fps_mode->setChecked(Settings::values.force_30fps_mode);
 }
 
 void ConfigureDebug::ApplyConfiguration() {
@@ -54,6 +56,7 @@ void ConfigureDebug::ApplyConfiguration() {
     Settings::values.disable_cpu_opt = ui->disable_cpu_opt->isChecked();
     Settings::values.renderer_debug = ui->enable_graphics_debugging->isChecked();
     Settings::values.disable_macro_jit = ui->disable_macro_jit->isChecked();
+    Settings::values.force_30fps_mode = ui->force_30fps_mode->isChecked();
     Debugger::ToggleConsole();
     Log::Filter filter;
     filter.ParseFilterString(Settings::values.log_filter);

src/yuzu/configuration/configure_debug.ui

@@ -235,6 +235,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="force_30fps_mode">
+        <property name="text">
+         <string>Force 30 FPS mode</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

src/yuzu/configuration/configure_graphics_advanced.cpp

@@ -25,8 +25,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {
     ui->use_assembly_shaders->setEnabled(runtime_lock);
     ui->use_assembly_shaders->setChecked(Settings::values.use_assembly_shaders);
     ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time);
-    ui->force_30fps_mode->setEnabled(runtime_lock);
-    ui->force_30fps_mode->setChecked(Settings::values.force_30fps_mode);
     ui->anisotropic_filtering_combobox->setEnabled(runtime_lock);
     ui->anisotropic_filtering_combobox->setCurrentIndex(Settings::values.max_anisotropy);
 }
@@ -37,7 +35,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {
     Settings::values.use_vsync = ui->use_vsync->isChecked();
     Settings::values.use_assembly_shaders = ui->use_assembly_shaders->isChecked();
     Settings::values.use_fast_gpu_time = ui->use_fast_gpu_time->isChecked();
-    Settings::values.force_30fps_mode = ui->force_30fps_mode->isChecked();
     Settings::values.max_anisotropy = ui->anisotropic_filtering_combobox->currentIndex();
 }
 

src/yuzu/configuration/configure_graphics_advanced.ui

@@ -72,13 +72,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QCheckBox" name="force_30fps_mode">
-          <property name="text">
-           <string>Force 30 FPS mode</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QCheckBox" name="use_fast_gpu_time">
           <property name="text">