Merge branch 'master' of https://github.com/LizardByte/Sunshine

# Conflicts:
#	.github/workflows/ci-copr.yml
#	.github/workflows/ci-flatpak.yml
#	.github/workflows/ci-homebrew.yml
#	.github/workflows/ci-linux.yml
#	.github/workflows/ci-windows.yml
#	.github/workflows/ci.yml
#	.github/workflows/localize.yml
#	README.md
#	scripts/icons/convert_and_pack.sh
#	src/config.cpp
#	src/config.h
#	src/confighttp.cpp
#	src/logging.cpp
#	src/video.cpp
#	src_assets/common/assets/web/config.html
#	src_assets/common/assets/web/public/assets/locale/en.json
#	src_assets/common/assets/web/public/assets/locale/it.json
#	src_assets/windows/misc/gamepad/install-gamepad.bat
#	third-party/build-deps
#	third-party/moonlight-common-c
#	tools/CMakeLists.txt

src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { ref } from 'vue'
 import PlatformLayout from '../../../PlatformLayout.vue'
+import Checkbox from "../../../Checkbox.vue";
 
 const props = defineProps({
   platform: String,

src_assets/common/assets/web/configs/tabs/audiovideo/DisplayModesSettings.vue

@@ -17,6 +17,13 @@ const config = ref(props.config)
     <input type="number" class="form-control" id="max_bitrate" placeholder="0" v-model="config.max_bitrate" />
     <div class="form-text">{{ $t("config.max_bitrate_desc") }}</div>
   </div>
+
+  <!--minimum_fps_target-->
+  <div class="mb-3">
+    <label for="minimum_fps_target" class="form-label">{{ $t("config.minimum_fps_target") }}</label>
+    <input type="number" min="0" max="1000" class="form-control" id="minimum_fps_target" placeholder="0" v-model="config.minimum_fps_target" />
+    <div class="form-text">{{ $t("config.minimum_fps_target_desc") }}</div>
+  </div>
 </template>
 
 <style scoped>