- resync commit to fix .git error

rscustom · Jul 4, 2018 · 4ed9193 · 4ed9193
1 parent 5614fa2
commit 4ed9193
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs
@@ -1794,9 +1794,8 @@ public DLCPackageData PackageGenerate()
                         // commented out ... don't nag user with this message
                         // MessageBox.Show("Existing DD content in arrangement: " + arr.Name + " was not changed", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Information);
                         Debug.WriteLine("Existing DD content in arrangement: " + arr.Name + " was not changed");
-                        ShowCurrentOperation("Existing DD content in arrangement: " + arr.Name + " was not changed");
-
-                        // add custom xml comment as needed
+
+                        // add custom xml comment if needed
                         var hasComment = arr.XmlComments.Any(x => x.ToString().Contains("DDC"));
                         if (!hasComment)
                             Song2014.WriteXmlComments(arr.SongXml.File, arr.XmlComments, customComment: "DDC by CDLC author");

diff --git a/RocksmithToolkitLib/RocksmithToolkitLib.csproj b/RocksmithToolkitLib/RocksmithToolkitLib.csproj
@@ -267,15 +267,18 @@
 rem RocksmithPreBuild.exe takes care of updating Assembly.cs files and AppVeyor versioning information
 
 if $(ConfigurationName) == Debug (
-  CD "$(SolutionDir)"
+CD "$(SolutionDir)"
 
-  rem there are several alternate usages for RocksmithPreBuild.exe
+rem there are several alternate usages for RocksmithPreBuild.exe
+rem if a 'Type 1 Error' occures check the .git folder for missing critical contents
+rem usual this error occures after .git Garbage Cleanup
+rem resyncing the commit usual fixes the error
 
-         cmd /c "RocksmithPreBuild.exe PREBUILD READ READ"
-  rem cmd /c "RocksmithPreBuild.exe PREBUILD 2.8.4.1 BETA"
-  rem cmd /c "RocksmithPreBuild.exe PREBUILD 2.8.4.0 RELEASE"
-)
+cmd /c "RocksmithPreBuild.exe PREBUILD READ READ"
 
+rem cmd /c "RocksmithPreBuild.exe PREBUILD 2.8.4.1 BETA"
+rem cmd /c "RocksmithPreBuild.exe PREBUILD 2.8.4.0 RELEASE"
+)
 rem there are some hidden prebuild commands for OSX and Linux in the RocksmithToolkitLib.csproj these call the 'prebuild.sh' file</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/Third-party Apps/tools/readme.txt b/Third-party Apps/tools/readme.txt
@@ -1,12 +1,12 @@
-The applications of this directory were made
-by developers who are not part of this project.
+RocksmithToolkitLib.dll uses the applications in this directory.
+These applications were made by developers who are not part of this project.
 
-All claims and liabilities of any misuse of the programs
-of this folder should be directed to the respective developer.
+All claims and liabilities of any misuse of the programs of this folder 
+should be directed to the respective developer.
 
+The files below are used to recover Rocksmith (Wwise) audio
+files to default .ogg file that can be used in any sound player:
 
-- Used on OggConverter TAB:
-Obs.: The files below are used to recover Rocksmith (Wwise) audio files to default .ogg file that can be used in any sound player:
 1. revorb.exe
 2. ww2ogg.exe
 3. packed_codebooks.bin