Moving back to feat to enable SteamDeck testing

On branch cooker
 Changes to be committed:
	modified:   config/retrodeck/reference_lists/features.json
	modified:   tools/configurator/export_presets.cfg
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres

config/retrodeck/reference_lists/features.json

@@ -1,7 +1,4 @@
 {
-<<<<<<< HEAD
-
-=======
   "about_links": {
     "rd_changelog": {
       "description": "Opens the RetroDECK change log in your default browser",
@@ -1090,5 +1087,4 @@
       "launch": "xemu"
     }
   }
->>>>>>> feat/godot
 }

tools/configurator/export_presets.cfg

@@ -19,7 +19,7 @@ encrypt_directory=false
 custom_template/debug=""
 custom_template/release=""
 debug/export_console_wrapper=1
-binary_format/embed_pck=false
+binary_format/embed_pck=true
 texture_format/bptc=true
 texture_format/s3tc=true
 texture_format/etc=false

tools/configurator/project.godot

@@ -93,16 +93,6 @@ back_button={
 }
 action_button={
 "deadzone": 0.5,
-"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
-]
-}
-back_button={
-"deadzone": 0.5,
-"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
-]
-}
-action_button={
-"deadzone": 0.5,
 "events": []
 }