Merge branch 'master' into master

Author: TheBestAstroNOT

changelog-template.hbs

@@ -4,6 +4,13 @@
 Just a few community PRs and miscellany. As usual, Reloaded-II is on life support while I spend
 the next years building the next best thing - if you want features, please contribute!
 
+# 1.29.5: Add missing `ModConfig.json` to include files
+
+There was a small regression in `1.29.3`, where the default includes did not
+include `ModConfig.json`, that's now been fixed.
+
+In addition I added a missing 'include files' label before the second table.
+
 # 1.29.4: Misc Linux Installer Improvements
 
 Small improvements to install on Linux:

source/Reloaded.Mod.Launcher/Pages/Dialogs/PublishModDialog.xaml

@@ -1,4 +1,4 @@
-<default:ReloadedWindow x:Class="Reloaded.Mod.Launcher.Pages.Dialogs.PublishModDialog"
+<default:ReloadedWindow x:Class="Reloaded.Mod.Launcher.Pages.Dialogs.PublishModDialog"
                         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -137,6 +137,12 @@
                                     Click="AddIgnoreRegex_Click" />
                         </StackPanel>
 
+                        <TextBlock Text="{DynamicResource PublishModIncludeTitle}" 
+                                   Margin="{DynamicResource CommonItemVerticalMarginSmaller}"
+                                   HorizontalAlignment="Center" 
+                                   VerticalAlignment="Center"
+                                   Style="{DynamicResource DefaultTextBlock}" />
+
                         <DataGrid Margin="{DynamicResource CommonItemVerticalMarginSmaller}"
                                   HorizontalAlignment="Center" 
                                   VerticalAlignment="Center" 

source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj

@@ -7,7 +7,7 @@
 	  <UseWPF>true</UseWPF>
     <AssemblyName>Reloaded-II</AssemblyName>
     <RootNamespace>Reloaded.Mod.Launcher</RootNamespace>
-    <Version>1.29.4</Version>
+    <Version>1.29.5</Version>
     <Copyright>Sewer56 ~ $([System.DateTime]::UtcNow.ToString("s")) | $(Version)</Copyright>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <ApplicationIcon>appicon.ico</ApplicationIcon>

source/Reloaded.Mod.Loader.IO/Config/ModConfig.cs

@@ -39,7 +39,7 @@ public class ModConfig : ObservableObject, IConfig<ModConfig>, IModConfig
 
     /// Publishing
     public List<string> IgnoreRegexes { get; set; } = [@".*\.json"];
-    public List<string> IncludeRegexes { get; set; } = [@"\.deps\.json", @"\.runtimeconfig\.json"];
+    public List<string> IncludeRegexes { get; set; } = [@"\.deps\.json", @"\.runtimeconfig\.json", @"ModConfig\.json"];
 
     [JsonIgnore]
     public string ModSubDirs { get; set; } = string.Empty;

source/Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj

@@ -14,7 +14,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <NoWarn>$(NoWarn);NU1605;NU1701</NoWarn>
-	  <Version>1.29.4</Version>
+	  <Version>1.29.5</Version>
     <CETCompat>false</CETCompat>
     <Platforms>x86;x64</Platforms>
     <GenerateDepsJson>false</GenerateDepsJson>