Merge branch 'development' into multithreading-ai

Author: Causeless

Data/Base.rte/GUIs/SettingsGUI.ini

@@ -2789,22 +2789,6 @@ DrawBackground = True
 DrawType = Image
 DrawColor = 0
 
-[LabelPresetNotAvailableSNES]
-ControlType = LABEL
-Parent = CollectionBoxPresetDPadSNES
-X = 18
-Y = 17
-Width = 64
-Height = 29
-Visible = True
-Enabled = True
-Name = LabelPresetNotAvailableSNES
-Anchor = Left, Top
-ToolTip = None
-Text = N/A
-HAlignment = centre
-VAlignment = middle
-
 [CollectionBoxPresetAnalogDS4]
 ControlType = COLLECTIONBOX
 Parent = CollectionBoxWizardPresets
@@ -2851,22 +2835,6 @@ DrawBackground = True
 DrawType = Image
 DrawColor = 0
 
-[LabelPresetNotAvailableDS4]
-ControlType = LABEL
-Parent = CollectionBoxPresetAnalogDS4
-X = 16
-Y = 8
-Width = 68
-Height = 47
-Visible = True
-Enabled = True
-Name = LabelPresetNotAvailableDS4
-Anchor = Left, Top
-ToolTip = None
-Text = N/A
-HAlignment = centre
-VAlignment = middle
-
 [CollectionBoxPresetAnalogXB360]
 ControlType = COLLECTIONBOX
 Parent = CollectionBoxWizardPresets