Add changelog 3745 (FAForever#4333)

Ruan7053 · Nov 6, 2022 · ef37b03 · ef37b03
1 parent 398e38a
commit ef37b03
Show file tree

Hide file tree

Showing 11 changed files with 1,205 additions and 14 deletions.
diff --git a/changelog-dev.md b/changelog-dev.md
diff --git a/changelog.md b/changelog.md
diff --git a/init.lua b/init.lua
@@ -96,6 +96,7 @@ deprecatedMods["OnScreenReclaimCounter"] = "8"
 deprecatedMods["ORV"] = "1"
 deprecatedMods["SmartReclaimSupport"] = "3"
 deprecatedMods["DrimsUIPack"] = "3"
+deprecatedMods["Rheclaim"] = "2"
 
 -- convert all mod folder name keys to lower case to prevent typos
 deprecatedMods = LowerHashTable(deprecatedMods)
@@ -523,7 +524,7 @@ end
 -- END OF COPY --
 
 -- minimum viable shader version - should be bumped to the next release version when we change the shaders
-local minimumShaderVersion = 3729
+local minimumShaderVersion = 3745
 
 -- look for unviable shaders and remove them
 local shaderCache = SHGetFolderPath('LOCAL_APPDATA') .. 'Gas Powered Games/Supreme Commander Forged Alliance/cache'

diff --git a/init_faf.lua b/init_faf.lua
@@ -96,6 +96,7 @@ deprecatedMods["OnScreenReclaimCounter"] = "8"
 deprecatedMods["ORV"] = "1"
 deprecatedMods["SmartReclaimSupport"] = "3"
 deprecatedMods["DrimsUIPack"] = "3"
+deprecatedMods["Rheclaim"] = "2"
 
 -- convert all mod folder name keys to lower case to prevent typos
 deprecatedMods = LowerHashTable(deprecatedMods)
@@ -523,7 +524,7 @@ end
 -- END OF COPY --
 
 -- minimum viable shader version - should be bumped to the next release version when we change the shaders
-local minimumShaderVersion = 3729
+local minimumShaderVersion = 3745
 
 -- look for unviable shaders and remove them
 local shaderCache = SHGetFolderPath('LOCAL_APPDATA') .. 'Gas Powered Games/Supreme Commander Forged Alliance/cache'

diff --git a/init_fafbeta.lua b/init_fafbeta.lua
@@ -96,6 +96,7 @@ deprecatedMods["OnScreenReclaimCounter"] = "8"
 deprecatedMods["ORV"] = "1"
 deprecatedMods["SmartReclaimSupport"] = "3"
 deprecatedMods["DrimsUIPack"] = "3"
+deprecatedMods["Rheclaim"] = "2"
 
 -- convert all mod folder name keys to lower case to prevent typos
 deprecatedMods = LowerHashTable(deprecatedMods)

diff --git a/init_fafdevelop.lua b/init_fafdevelop.lua
@@ -96,6 +96,7 @@ deprecatedMods["OnScreenReclaimCounter"] = "8"
 deprecatedMods["ORV"] = "1"
 deprecatedMods["SmartReclaimSupport"] = "3"
 deprecatedMods["DrimsUIPack"] = "3"
+deprecatedMods["Rheclaim"] = "2"
 
 -- convert all mod folder name keys to lower case to prevent typos
 deprecatedMods = LowerHashTable(deprecatedMods)

diff --git a/init_shared.lua b/init_shared.lua
@@ -96,6 +96,7 @@ deprecatedMods["OnScreenReclaimCounter"] = "8"
 deprecatedMods["ORV"] = "1"
 deprecatedMods["SmartReclaimSupport"] = "3"
 deprecatedMods["DrimsUIPack"] = "3"
+deprecatedMods["Rheclaim"] = "2"
 
 -- convert all mod folder name keys to lower case to prevent typos
 deprecatedMods = LowerHashTable(deprecatedMods)
@@ -520,4 +521,19 @@ local function LoadVaultContent(path)
     MountModContent(path .. '/mods')
 end
 
--- END OF COPY --
+-- END OF COPY --
+
+-- minimum viable shader version - should be bumped to the next release version when we change the shaders
+local minimumShaderVersion = 3745
+
+-- look for unviable shaders and remove them
+local shaderCache = SHGetFolderPath('LOCAL_APPDATA') .. 'Gas Powered Games/Supreme Commander Forged Alliance/cache'
+for k, file in IoDir(shaderCache .. '/*') do
+    if file != '.' and file != '..' then 
+        local version = tonumber(string.sub(file, -4))
+        if not version or version < minimumShaderVersion then 
+            LOG("Removed incompatible shader: " .. file)
+            os.remove(shaderCache .. '/' .. file)
+        end
+    end
+end
diff --git a/lua/ui/game/cursor/hover.lua b/lua/ui/game/cursor/hover.lua
@@ -179,4 +179,4 @@ local function HoverScanningThread()
     end
 end
 
-Trash:Add(ForkThread(HoverScanningThread))
+-- Trash:Add(ForkThread(HoverScanningThread))
diff --git a/lua/ui/lobby/changelogData.lua b/lua/ui/lobby/changelogData.lua
diff --git a/lua/version.lua b/lua/version.lua
@@ -1,6 +1,6 @@
-local Version = "3744"
----@alias PATCH "3744"
----@alias VERSION "1.5.3744"
+local Version = "3745"
+---@alias PATCH "3745"
+---@alias VERSION "1.5.3745"
 ---@return PATCH
 function GetVersion()
     LOG('Supreme Commander: Forged Alliance version ' .. Version)

diff --git a/mod_info.lua b/mod_info.lua
@@ -3,7 +3,7 @@
 -- Documentation for the extended FAF mod_info.lua format can be found here:
 -- https://github.com/FAForever/fa/wiki/mod_info.lua-documentation
 name = "Forged Alliance Forever"
-version = 3744
+version = 3745
 _faf_modname='faf'
 copyright = "Forged Alliance Forever Community"
 description = "Forged Alliance Forever extends Forged Alliance, bringing new patches, game modes, units, ladder, and much more!"
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,4 +179,4 @@ local function HoverScanningThread() @@
         end
     end
-    Trash:Add(ForkThread(HoverScanningThread))
+    -- Trash:Add(ForkThread(HoverScanningThread))