Rekku 56ef6b89e7 Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker ... Conflicts: config/retrodeck/reference_lists/features.json tools/configurator/components/bios_check/bios_check.gd tools/configurator/locales/interface.de.translation tools/configurator/locales/interface.en.translation tools/configurator/locales/interface.it.translation tools/configurator/locales/interface.ja.translation tools/configurator/locales/interface.sv.translation tools/configurator/locales/interface.ua.translation tools/configurator/locales/interface.zh.translation tools/configurator/main.gd tools/configurator/main.tscn tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres tools/configurator/scripts/data_handler.gd tools/configurator/scripts/emulator.gd All conflicts fixed but you are still merging. Changes to be committed: modified: config/retrodeck/reference_lists/features.json modified: tools/configurator/TabContainer.gd modified: tools/configurator/components/bios_check/bios_check.gd modified: tools/configurator/components/bios_check/bios_popup_content.tscn modified: tools/configurator/components/popup.gd modified: tools/configurator/components/popup.tscn new file: tools/configurator/components/popup_dialogue.gd new file: tools/configurator/components/popup_dialogue.tscn new file: tools/configurator/controller_guide.gd deleted: tools/configurator/locales/interface.de.translation deleted: tools/configurator/locales/interface.en.translation deleted: tools/configurator/locales/interface.it.translation deleted: tools/configurator/locales/interface.ja.translation deleted: tools/configurator/locales/interface.sv.translation deleted: tools/configurator/locales/interface.ua.translation deleted: tools/configurator/locales/interface.zh.translation modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres new file: tools/configurator/scripts/SystemTab.gd modified: tools/configurator/scripts/data_handler.gd modified: tools/configurator/scripts/emulator.gd		2024-09-06 13:21:34 +01:00
..
flags	feat/godot configurator (#866)	2024-08-08 16:46:53 +02:00
pixel_ui_theme	Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker	2024-09-06 13:21:34 +01:00
Rekku	feat/godot configurator (#866)	2024-08-08 16:46:53 +02:00
configurator.mp3	feat/godot configurator (#866)	2024-08-08 16:46:53 +02:00
configurator.mp3.import	feat/godot configurator (#866)	2024-08-08 16:46:53 +02:00