Merge remote-tracking branch 'origin/main' into ipc_new

# Conflicts: # CustomizePlus/Core/ServiceManagerBuilder.cs # CustomizePlus/Game/Services/GameObjectService.cs # CustomizePlus/Profiles/ProfileManager.cs
2024-03-21 23:18:58 +03:00
parent 589d1075b4 7195d5a0c5
commit 4c94667989
21 changed files with 69 additions and 397 deletions
--- a/CustomizePlus/UI/Windows/Controls/TemplateCombo.cs
+++ b/CustomizePlus/UI/Windows/Controls/TemplateCombo.cs
@@ -30,7 +30,7 @@ public abstract class TemplateComboBase : FilterComboCache<Tuple<Template, strin
        TemplateChanged templateChanged,
        //TabSelected tabSelected,
        PluginConfiguration configuration)
-        : base(generator, logger)
+        : base(generator, MouseWheelType.Control, logger)
    {
        _templateChanged = templateChanged;
        //TabSelected = tabSelected;