Skip to content

Commit 22c4b50

Browse files
committed
Submodules, changelog, words, editorconfig
1 parent 46eeabc commit 22c4b50

File tree

7 files changed

+62
-8
lines changed

7 files changed

+62
-8
lines changed

CustomizePlus.GameData/packages.lock.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,19 @@
88
"resolved": "1.2.25",
99
"contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg=="
1010
},
11+
"FlatSharp.Compiler": {
12+
"type": "Transitive",
13+
"resolved": "7.9.0",
14+
"contentHash": "MU6808xvdbWJ3Ev+5PKalqQuzvVbn1DzzQH8txRDHGFUNDvHjd+ejqpvnYc9BSJ8Qp8VjkkpJD8OzRYilbPp3A=="
15+
},
16+
"FlatSharp.Runtime": {
17+
"type": "Transitive",
18+
"resolved": "7.9.0",
19+
"contentHash": "Bm8+WqzEsWNpxqrD5x4x+zQ8dyINlToCreM5FI2oNSfUVc9U9ZB+qztX/jd8rlJb3r0vBSlPwVLpw0xBtPa3Vw==",
20+
"dependencies": {
21+
"System.Memory": "4.5.5"
22+
}
23+
},
1124
"JetBrains.Annotations": {
1225
"type": "Transitive",
1326
"resolved": "2024.3.0",
@@ -26,6 +39,11 @@
2639
"resolved": "9.0.2",
2740
"contentHash": "MNe7GSTBf3jQx5vYrXF0NZvn6l7hUKF6J54ENfAgCO8y6xjN1XUmKKWG464LP2ye6QqDiA1dkaWEZBYnhoZzjg=="
2841
},
42+
"System.Memory": {
43+
"type": "Transitive",
44+
"resolved": "4.5.5",
45+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
46+
},
2947
"ottergui": {
3048
"type": "Project",
3149
"dependencies": {
@@ -39,8 +57,10 @@
3957
"penumbra.gamedata": {
4058
"type": "Project",
4159
"dependencies": {
60+
"FlatSharp.Compiler": "[7.9.0, )",
61+
"FlatSharp.Runtime": "[7.9.0, )",
4262
"OtterGui": "[1.0.0, )",
43-
"Penumbra.Api": "[5.6.1, )",
63+
"Penumbra.Api": "[5.10.0, )",
4464
"Penumbra.String": "[1.0.6, )"
4565
}
4666
},

CustomizePlus/.editorconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ csharp_indent_labels = one_less_than_current
88
csharp_using_directive_placement = outside_namespace:silent
99
csharp_prefer_simple_using_statement = true:suggestion
1010
csharp_prefer_braces = true:silent
11-
csharp_style_namespace_declarations = file_scoped:error
11+
csharp_style_namespace_declarations = block_scoped:suggestion
1212
csharp_style_prefer_method_group_conversion = true:silent
1313
csharp_style_prefer_top_level_statements = true:silent
1414
csharp_style_expression_bodied_methods = false:silent
@@ -21,6 +21,8 @@ csharp_style_expression_bodied_lambdas = true:silent
2121
csharp_style_expression_bodied_local_functions = false:silent
2222
csharp_style_throw_expression = true:suggestion
2323
csharp_style_prefer_null_check_over_type_check = true:suggestion
24+
csharp_style_prefer_primary_constructors = true:suggestion
25+
csharp_prefer_system_threading_lock = true:suggestion
2426
[*.{cs,vb}]
2527
#### Naming styles ####
2628

@@ -83,3 +85,7 @@ dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
8385
dotnet_style_prefer_compound_assignment = true:suggestion
8486
dotnet_style_prefer_simplified_interpolation = true:suggestion
8587
dotnet_style_namespace_match_folder = true:error
88+
dotnet_style_qualification_for_field = false:suggestion
89+
dotnet_style_qualification_for_property = false:suggestion
90+
dotnet_style_qualification_for_method = false:suggestion
91+
dotnet_style_qualification_for_event = false:suggestion

CustomizePlus/UI/Windows/CPlusChangeLog.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public CPlusChangeLog(PluginConfiguration config)
3030
Add2_0_7_15(Changelog);
3131
Add2_0_7_16(Changelog);
3232
Add2_0_7_23(Changelog);
33+
Add2_0_7_27(Changelog);
3334
}
3435

3536
private (int, ChangeLogDisplayType) ConfigData()
@@ -42,6 +43,13 @@ private void Save(int version, ChangeLogDisplayType type)
4243
_config.Save();
4344
}
4445

46+
private static void Add2_0_7_27(Changelog log)
47+
=> log.NextVersion("Version 2.0.7.27")
48+
.RegisterEntry("Added ability to toggle template in a profile without removing it. (by Caraxi)")
49+
.RegisterEntry("IPC version updated to 6.2.")
50+
.RegisterEntry("Added Profile.GetTemplates, Profile.EnableTemplateByUniqueId, Profile.DisableTemplateByUniqueId IPC endpoints. (by Caraxi)", 1)
51+
.RegisterEntry("Fixed crash when trying to open template/profile tab if there is a template/profile with empty name. (2.0.7.25)");
52+
4553
private static void Add2_0_7_23(Changelog log)
4654
=> log.NextVersion("Version 2.0.7.23")
4755
.RegisterImportant("Support for 7.3 and Dalamud API 13.")

CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilePanel.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,10 @@ private void DrawTemplateArea()
453453
DrawDragDrop(_selector.Selected!, idx);
454454

455455
ImGui.TableNextColumn();
456-
var enabled = !this._selector.Selected!.DisabledTemplates.Contains(template.UniqueId);
456+
var enabled = !_selector.Selected!.DisabledTemplates.Contains(template.UniqueId);
457457
if (ImGui.Checkbox("##EnableCheckbox", ref enabled))
458-
this._manager.ToggleTemplate(_selector.Selected!, idx);
459-
ImGuiUtil.HoverTooltip("Enable or disable this template without removing it from profile");
458+
_manager.ToggleTemplate(_selector.Selected!, idx);
459+
ImGuiUtil.HoverTooltip("Whether this template is applied to the profile.");
460460

461461
ImGui.TableNextColumn();
462462
_templateCombo.Draw(_selector.Selected!, template, idx);
@@ -466,7 +466,7 @@ private void DrawTemplateArea()
466466

467467
var disabledCondition = _templateEditorManager.IsEditorActive || template.IsWriteProtected;
468468

469-
if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.Edit.ToIconString(), new Vector2(ImGui.GetFrameHeight()), "Open this template in the template editor", disabledCondition, true))
469+
if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.Edit.ToIconString(), new Vector2(ImGui.GetFrameHeight()), "Open this template in the template editor.", disabledCondition, true))
470470
_templateEditorEvent.Invoke(TemplateEditorEvent.Type.EditorEnableRequested, template);
471471

472472
if (disabledCondition)

CustomizePlus/packages.lock.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@
3838
"resolved": "1.1.118",
3939
"contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw=="
4040
},
41+
"FlatSharp.Compiler": {
42+
"type": "Transitive",
43+
"resolved": "7.9.0",
44+
"contentHash": "MU6808xvdbWJ3Ev+5PKalqQuzvVbn1DzzQH8txRDHGFUNDvHjd+ejqpvnYc9BSJ8Qp8VjkkpJD8OzRYilbPp3A=="
45+
},
46+
"FlatSharp.Runtime": {
47+
"type": "Transitive",
48+
"resolved": "7.9.0",
49+
"contentHash": "Bm8+WqzEsWNpxqrD5x4x+zQ8dyINlToCreM5FI2oNSfUVc9U9ZB+qztX/jd8rlJb3r0vBSlPwVLpw0xBtPa3Vw==",
50+
"dependencies": {
51+
"System.Memory": "4.5.5"
52+
}
53+
},
4154
"JetBrains.Annotations": {
4255
"type": "Transitive",
4356
"resolved": "2024.3.0",
@@ -53,6 +66,11 @@
5366
"resolved": "9.0.2",
5467
"contentHash": "MNe7GSTBf3jQx5vYrXF0NZvn6l7hUKF6J54ENfAgCO8y6xjN1XUmKKWG464LP2ye6QqDiA1dkaWEZBYnhoZzjg=="
5568
},
69+
"System.Memory": {
70+
"type": "Transitive",
71+
"resolved": "4.5.5",
72+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
73+
},
5674
"System.Threading.Tasks.Extensions": {
5775
"type": "Transitive",
5876
"resolved": "4.5.4",
@@ -89,6 +107,8 @@
89107
"penumbra.gamedata": {
90108
"type": "Project",
91109
"dependencies": {
110+
"FlatSharp.Compiler": "[7.9.0, )",
111+
"FlatSharp.Runtime": "[7.9.0, )",
92112
"OtterGui": "[1.0.0, )",
93113
"Penumbra.Api": "[5.10.0, )",
94114
"Penumbra.String": "[1.0.6, )"

0 commit comments

Comments
 (0)