@@ -68,8 +68,19 @@ jobs:
         $hotfixVersion = Get-Version-Component 'VER_HOTFIX_VERSION' '#define VER_HOTFIX_VERSION\s+'
         $buildVersion = Get-Version-Component 'VER_BUILD_NUMBER' '#define VER_BUILD_NUMBER\s+'
         
+        # Release flavour and fork tag, so the archive name matches VER_PRODUCT_VERSION_STR.
+        # Anchoring on #define skips the #ifdef and #ifndef lines that carry the same names.
+        $resourceLines = Get-Content $resourceFile
+        $devRelease = $resourceLines | Select-String -Pattern '^\s*#define\s+VER_DEV_RELEASE' -Quiet
+        $forkLine = $resourceLines | Select-String -Pattern '^\s*#define\s+VER_FORK_TAG' | Select-Object -First 1
+
+        $forkTag = ''
+        if ($forkLine) { $forkTag = ($forkLine.Line -replace '.*"(.*)".*', '$1') }
+
+        if ($devRelease) { $suffix = "-dev" } else { $suffix = "-pre$buildVersion" }
+
         # Merge into a single version string
-        $version = "v$majorVersion.$minorVersion.$hotfixVersion-pre$buildVersion"
+        $version = "v$majorVersion.$minorVersion.$hotfixVersion$suffix$forkTag"
         
         # Get the current date in a specific format (e.g., YYYYMMDD)
         $date = Get-Date -Format "yyyyMMdd"
@@ -104,17 +115,46 @@ jobs:
     - name: Add the readme
       run: Copy-Item ${{ github.workspace }}\dist\README.md ${{ github.workspace }}\x64\Release\a\README.md
 
+    # Cut before the redistributables land, so this archive carries the loader alone.
     - name: Compress the artifact
       run: |
         $zipName = "${{ steps.get_version.outputs.filename }}.7z"
         7z a -r ${{ github.workspace }}\$zipName ${{ github.workspace }}\x64\Release\a\*.*
 
       continue-on-error: false
-        
+
     - uses: actions/upload-artifact@v7.0.0
       with:
         name: '${{ steps.get_version.outputs.filename }}'
         path: '${{ github.workspace }}\${{ steps.get_version.outputs.filename }}.7z'
         archive: false
         compression-level: 0
         if-no-files-found: error
+
+    # Streamline 2.14. A game carrying an older set stops at 2X whatever the ini asks for, and the
+    # recovery step in the readme is to copy these over the ones it ships.
+    - name: Add Streamline
+      run: |
+        $target = "${{ github.workspace }}\x64\Release\a\OptiScaler\streamline"
+        New-Item -ItemType Directory -Force -Path $target | Out-Null
+        Copy-Item ${{ github.workspace }}\dist\streamline\* $target
+
+    # DLSS 310.9 snippets. OptiScaler searches its own folder ahead of the exe folder, so these
+    # are picked up without touching what the game ships. nvngx_dlssnr.dll is not among them.
+    - name: Add NGX snippets
+      run: Copy-Item ${{ github.workspace }}\dist\nvngx\* ${{ github.workspace }}\x64\Release\a\OptiScaler\
+
+    - name: Compress the artifact with the redistributables
+      run: |
+        $zipName = "${{ steps.get_version.outputs.filename }}_with_DLSS.7z"
+        7z a -r ${{ github.workspace }}\$zipName ${{ github.workspace }}\x64\Release\a\*.*
+
+      continue-on-error: false
+
+    - uses: actions/upload-artifact@v7.0.0
+      with:
+        name: '${{ steps.get_version.outputs.filename }}_with_DLSS'
+        path: '${{ github.workspace }}\${{ steps.get_version.outputs.filename }}_with_DLSS.7z'
+        archive: false
+        compression-level: 0
+        if-no-files-found: error
@@ -420,6 +420,11 @@ FodyWeavers.xsd
 
 !external/directx_agility_sdk/lib/D3D12Core.dll
 
+# Streamline 2.14 and DLSS 310.9 redistributables, packaged into the build under OptiScaler
+# and OptiScaler/streamline.
+!dist/streamline/*.dll
+!dist/nvngx/*.dll
+
 # Fortran module files
 *.mod
 *.smod
 
@@ -6,17 +6,19 @@ Modify these to your OptiScaler.ini (read the comments, might not apply to you):
 
 ```ini
 [NvApi]
-; x2~x6 MFG spacing is uneven without this (basically frame generation will feel laggy)
+; x2~x6 MFG spacing is uneven without this (basically frame generation will feel laggy) for 40XX cards only! (?) older cards should keep it auto?
 DisableFlipMetering = true
 
-; ONLY IF YOURE ON LINUX? set this to true, otherwise keep to auto
+; only if youre on linux and noticing some weird motion pacing bug
 DisableReflexSync = true
 
 [DLSSG]
 ; only needed if you have a 40XX card
 AdaMfgUnlock = true
 ```
 
+These values should be tried and played with if things don't behave as you expect.
+
 ## Step 2:
 
 Put all these files in your game folder (next to the actual .exe, not the launcher)
@@ -32,7 +34,17 @@ you pick is the one you override in Step 5.
 ## Step 4:
 
 You need to put the `nvngx_dlssnr.dll` file (about 158mb) in the game's folder. Make sure to use
-the patched version if you have a card other than a 50XX.
+the patched version if you have a card other than a 50XX. It is not in either package.
+
+There are two downloads. The plain one is the loader by itself. The `_with_DLSS` one also carries,
+already in place and needing no action:
+
+- `OptiScaler\nvngx_dlss.dll`, `nvngx_dlssd.dll`, `nvngx_dlssg.dll` are DLSS 310.9. OptiScaler
+  searches its own folder ahead of the exe folder, so these are used without touching what the
+  game ships.
+- `OptiScaler\streamline\sl.*.dll` are Streamline 2.14.
+
+Take the plain one if the game already has newer, or you keep your own set.
 
 ## Step 5 (proton only)
 
@@ -50,18 +62,19 @@ For support, contact y4my4m in Harmony's town hall (https://har.mony.lol)
 
 ---
 
-In case of emergency:
-- Copy all the sl.*.dll files in OptiScaler/streamline into the base game's folder, essentially
-  updating to streamline 2.14
-- Put nvngx_dlss.dll, nvngx_dlssd.dll, nvngx_dlssg.dll from DLSS 310.9 into the game's folder
+In case of emergency, with the files from the `_with_DLSS` package:
+- Copy `OptiScaler\streamline\sl.*.dll` over the set the game ships
+- Copy `OptiScaler\nvngx_dlss.dll`, `nvngx_dlssd.dll`, `nvngx_dlssg.dll` next to the exe
 
-You shouldn't have to do this, but worth the shot if nothing else works.
+You shouldn't have to do this, but worth the shot if nothing else works. Keep a copy of whatever
+you overwrite.
 
-A game that ships its own Streamline loads it from where it put it, not from the folder holding
-the exe. Unreal titles keep it under `Engine\Plugins\Runtime\Nvidia\Streamline\Binaries\
-ThirdParty\Win64`. Copy over that set, and keep a copy of the originals.
+The first one is the fix for a game stuck at 2X. A game that ships its own Streamline loads it
+from where it put it, and OptiScaler's copy does not override that. Unreal titles keep theirs
+under `Engine\Plugins\Runtime\Nvidia\Streamline\Binaries\ThirdParty\Win64`, which is where the
+files have to go, not next to the exe.
 
-The overlay reports the version it found. Below Streamline 2.7.1 there is no multi frame
+The overlay reports the Streamline version it found. Below 2.7.1 there is no multi frame
 generation to unlock and the ratio stops at 2X, whatever the ini asks for.
 
 ---
@@ -89,6 +102,8 @@ Versions before 4 are not recorded here.
   instead of being read and ignored.
 - A reported maximum below the configured interpolation count no longer rewrites that count
   in the ini.
+- A generated frame ceiling read before nvngx_dlssg.dll loads is no longer cached. It held
+  Ada's 1 for the session and clamped the ratio with it.
 - Neural Rendering on a native D3D11 upscaler names what it needs instead of waiting forever.
 - Per-pass Neural Rendering settings, and a pass ceiling that can be lifted.
 
 
@@ -0,0 +1,20 @@
+// The MIT License(MIT)
+// 
+// Copyright(c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files(the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions :
+// 
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.