Revert export-ignore

MAS/All-In-One-Version-KL/MAS_AIO.cmd

@@ -1,5 +1,5 @@
-@::fh36d7f-random
+@::yfh37fow-random
-@set masver=3.3
+@set masver=3.4
 @setlocal DisableDelayedExpansion
 @echo off
 
@@ -2423,6 +2423,7 @@ set error=1
 goto :starto16c2r
 )
 
+call :oh_expiredpreview 2013
 call :oh_fixprids
 call :oh_process
 if defined isOspp (
@@ -2480,6 +2481,7 @@ set error=1
 goto :startmsi
 )
 
+call :oh_expiredpreview 2016 2019 2021 2024
 call :oh_fixprids
 call :oh_process
 if defined isOspp (
@@ -2739,6 +2741,21 @@ exit /b
 
 ::========================================================================================================================================
 
+:oh_expiredpreview
+
+for %%# in (%*) do (
+if exist "!_oLPath!\ProPlus%%#PreviewVL_*.xrm-ms" if not exist "!_oLPath!\ProPlus%%#VL_*.xrm-ms" (
+set error=1
+set showfix=1
+call :dk_color %Red% "Checking Expired Preview Products       [Office %%# Preview Found]"
+call :dk_color %Blue% "Please run the Office updates first, and then attempt to activate it again."
+)
+)
+
+exit /b
+
+::========================================================================================================================================
+
 :oh_ppcpath
 
 if not defined isOspp (
@@ -4097,6 +4114,8 @@ if !_el!==1  cls & setlocal & set "_actwin=1"       & call :ts_start & endlocal
 goto :ts_menu
 )
 
+goto :ts_start
+
 ::========================================================================================================================================
 
 :ts_changemethod
@@ -4109,25 +4128,26 @@ echo:
 echo:
 echo        ______________________________________________________________
 echo: 
-call :dk_color2 %_White% "             [1] " %_Green% " Auto"
+call :dk_color2 %_White% "             [1] " %_Green% "Auto"
-echo                   Build 19041 and later:
+echo                  Builds ^>= 19041 - StaticCID (KMS4k if offline)
-echo                   Uses StaticCID, or KMS4k if offline.
+echo                  Builds ^<  19041 - ZeroCID
-echo                   Older builds: Uses ZeroCID.
+echo              __________________________________________________
-echo               _______________________________________________  
 echo: 
 echo              [2] StaticCID
-echo                   Needs Internet.
+echo                  Needs Internet
-echo                   Not for Windows 7 or older.
+echo                  Not for Windows 7 or older
-echo               _______________________________________________  
+echo              __________________________________________________
 echo:
 echo              [3] ZeroCID
-echo                   Works only on builds below 19041.
+echo                  Works reliably on builds below 19041
-echo               _______________________________________________  
+echo                  May break on builds between 19041-26100
+echo                  Does not work on builds above 26100.4188
+echo              __________________________________________________
 echo:
 echo              [4] KMS4k
-echo                   This applies only to volume products.
+echo                  Volume licenses only
-echo                   Activates for 4000+ years using KMS.
+echo                  Activates for 4000+ years
-echo               _______________________________________________      
+echo              __________________________________________________
 echo:
 echo              [5] Learn More
 echo              [0] %_exitmsg%
@@ -4977,6 +4997,7 @@ set error=1
 goto :ts_starto16c2r
 )
 
+call :oh_expiredpreview 2013
 if "%_actprojvis%"=="0" call :oh_fixprids
 call :ts_process
 
@@ -5018,6 +5039,7 @@ set error=1
 goto :ts_startmsi
 )
 
+call :oh_expiredpreview 2016 2019 2021 2024
 if "%_actprojvis%"=="0" call :oh_fixprids
 call :ts_process
 
@@ -12963,6 +12985,7 @@ set error=1
 goto :ks_starto16c2r
 )
 
+call :oh_expiredpreview 2013
 if "%_actprojvis%"=="0" call :oh_fixprids
 call :ks_process
 
@@ -13003,6 +13026,7 @@ set error=1
 goto :ks_startmsi
 )
 
+call :oh_expiredpreview 2016 2019 2021 2024
 if "%_actprojvis%"=="0" call :oh_fixprids
 call :ks_process
 
@@ -13915,8 +13939,8 @@ set srvlist=
 set -=
 
 set "srvlist=kms.03%-%k.org kms-default.cangs%-%hui.net kms.six%-%yin.com kms.moe%-%club.org kms.cgt%-%soft.com"
-set "srvlist=%srvlist% kms.id%-%ina.cn kms.moe%-%yuuko.com xinch%-%eng213618.cn kms.lol%-%i.best kms.my%-%ds.cloud"
+set "srvlist=%srvlist% kms.id%-%ina.cn kms.moe%-%yuuko.com xinch%-%eng213618.cn kms.lol%-%i.best kms.mc%-%06.net"
-set "srvlist=%srvlist% kms.0%-%t.net.cn win.k%-%ms.pub kms.wx%-%lost.com kms.moe%-%yuuko.top kms.gh%-%pym.com"
+set "srvlist=%srvlist% kms.0%-%t.net.cn win.k%-%ms.pub kms.wx%-%lost.com kms.moe%-%yuuko.top kms.gh%-%xi.com"
 
 set n=1
 for %%a in (%srvlist%) do (set %%a=&set server!n!=%%a&set /a n+=1)

MAS/Separate-Files-Version/Activators/HWID_Activation.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 

MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 

MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 
@@ -614,6 +614,7 @@ set error=1
 goto :starto16c2r
 )
 
+call :oh_expiredpreview 2013
 call :oh_fixprids
 call :oh_process
 if defined isOspp (
@@ -671,6 +672,7 @@ set error=1
 goto :startmsi
 )
 
+call :oh_expiredpreview 2016 2019 2021 2024
 call :oh_fixprids
 call :oh_process
 if defined isOspp (
@@ -930,6 +932,21 @@ exit /b
 
 ::========================================================================================================================================
 
+:oh_expiredpreview
+
+for %%# in (%*) do (
+if exist "!_oLPath!\ProPlus%%#PreviewVL_*.xrm-ms" if not exist "!_oLPath!\ProPlus%%#VL_*.xrm-ms" (
+set error=1
+set showfix=1
+call :dk_color %Red% "Checking Expired Preview Products       [Office %%# Preview Found]"
+call :dk_color %Blue% "Please run the Office updates first, and then attempt to activate it again."
+)
+)
+
+exit /b
+
+::========================================================================================================================================
+
 :oh_ppcpath
 
 if not defined isOspp (

MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 
@@ -876,6 +876,7 @@ set error=1
 goto :ks_starto16c2r
 )
 
+call :oh_expiredpreview 2013
 if "%_actprojvis%"=="0" call :oh_fixprids
 call :ks_process
 
@@ -916,6 +917,7 @@ set error=1
 goto :ks_startmsi
 )
 
+call :oh_expiredpreview 2016 2019 2021 2024
 if "%_actprojvis%"=="0" call :oh_fixprids
 call :ks_process
 
@@ -1096,6 +1098,21 @@ exit /b
 
 ::========================================================================================================================================
 
+:oh_expiredpreview
+
+for %%# in (%*) do (
+if exist "!_oLPath!\ProPlus%%#PreviewVL_*.xrm-ms" if not exist "!_oLPath!\ProPlus%%#VL_*.xrm-ms" (
+set error=1
+set showfix=1
+call :dk_color %Red% "Checking Expired Preview Products       [Office %%# Preview Found]"
+call :dk_color %Blue% "Please run the Office updates first, and then attempt to activate it again."
+)
+)
+
+exit /b
+
+::========================================================================================================================================
+
 ::  Some Office Retail to Volume converter tools may edit the ProductReleaseIds to add VL products. This code restores it because it may affect features.
 
 :oh_fixprids
@@ -2137,8 +2154,8 @@ set srvlist=
 set -=
 
 set "srvlist=kms.03%-%k.org kms-default.cangs%-%hui.net kms.six%-%yin.com kms.moe%-%club.org kms.cgt%-%soft.com"
-set "srvlist=%srvlist% kms.id%-%ina.cn kms.moe%-%yuuko.com xinch%-%eng213618.cn kms.lol%-%i.best kms.my%-%ds.cloud"
+set "srvlist=%srvlist% kms.id%-%ina.cn kms.moe%-%yuuko.com xinch%-%eng213618.cn kms.lol%-%i.best kms.mc%-%06.net"
-set "srvlist=%srvlist% kms.0%-%t.net.cn win.k%-%ms.pub kms.wx%-%lost.com kms.moe%-%yuuko.top kms.gh%-%pym.com"
+set "srvlist=%srvlist% kms.0%-%t.net.cn win.k%-%ms.pub kms.wx%-%lost.com kms.moe%-%yuuko.top kms.gh%-%xi.com"
 
 set n=1
 for %%a in (%srvlist%) do (set %%a=&set server!n!=%%a&set /a n+=1)

MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 
@@ -497,6 +497,8 @@ if !_el!==1  cls & setlocal & set "_actwin=1"       & call :ts_start & endlocal
 goto :ts_menu
 )
 
+goto :ts_start
+
 ::========================================================================================================================================
 
 :ts_changemethod
@@ -509,25 +511,26 @@ echo:
 echo:
 echo        ______________________________________________________________
 echo: 
-call :dk_color2 %_White% "             [1] " %_Green% " Auto"
+call :dk_color2 %_White% "             [1] " %_Green% "Auto"
-echo                   Build 19041 and later:
+echo                  Builds ^>= 19041 - StaticCID (KMS4k if offline)
-echo                   Uses StaticCID, or KMS4k if offline.
+echo                  Builds ^<  19041 - ZeroCID
-echo                   Older builds: Uses ZeroCID.
+echo              __________________________________________________
-echo               _______________________________________________  
 echo: 
 echo              [2] StaticCID
-echo                   Needs Internet.
+echo                  Needs Internet
-echo                   Not for Windows 7 or older.
+echo                  Not for Windows 7 or older
-echo               _______________________________________________  
+echo              __________________________________________________
 echo:
 echo              [3] ZeroCID
-echo                   Works only on builds below 19041.
+echo                  Works reliably on builds below 19041
-echo               _______________________________________________  
+echo                  May break on builds between 19041-26100
+echo                  Does not work on builds above 26100.4188
+echo              __________________________________________________
 echo:
 echo              [4] KMS4k
-echo                   This applies only to volume products.
+echo                  Volume licenses only
-echo                   Activates for 4000+ years using KMS.
+echo                  Activates for 4000+ years
-echo               _______________________________________________      
+echo              __________________________________________________
 echo:
 echo              [5] Learn More
 echo              [0] %_exitmsg%
@@ -1377,6 +1380,7 @@ set error=1
 goto :ts_starto16c2r
 )
 
+call :oh_expiredpreview 2013
 if "%_actprojvis%"=="0" call :oh_fixprids
 call :ts_process
 
@@ -1418,6 +1422,7 @@ set error=1
 goto :ts_startmsi
 )
 
+call :oh_expiredpreview 2016 2019 2021 2024
 if "%_actprojvis%"=="0" call :oh_fixprids
 call :ts_process
 
@@ -1999,6 +2004,21 @@ exit /b
 
 ::========================================================================================================================================
 
+:oh_expiredpreview
+
+for %%# in (%*) do (
+if exist "!_oLPath!\ProPlus%%#PreviewVL_*.xrm-ms" if not exist "!_oLPath!\ProPlus%%#VL_*.xrm-ms" (
+set error=1
+set showfix=1
+call :dk_color %Red% "Checking Expired Preview Products       [Office %%# Preview Found]"
+call :dk_color %Blue% "Please run the Office updates first, and then attempt to activate it again."
+)
+)
+
+exit /b
+
+::========================================================================================================================================
+
 ::  Some Office Retail to Volume converter tools may edit the ProductReleaseIds to add VL products. This code restores it because it may affect features.
 
 :oh_fixprids

MAS/Separate-Files-Version/Change_Office_Edition.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 

MAS/Separate-Files-Version/Change_Windows_Edition.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 

MAS/Separate-Files-Version/Extract_OEM_Folder.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 

MAS/Separate-Files-Version/Troubleshoot.cmd

@@ -1,4 +1,4 @@
-@set masver=3.3
+@set masver=3.4
 @echo off
 
 

README.md

@@ -69,8 +69,8 @@ or
 ---
 
 ```
-Latest Version: 3.3
+Latest Version: 3.4
-Release date: 1-June-2025
+Release date: 3-June-2025
 ```
 
 ### [Troubleshooting / Help](https://massgrave.dev/troubleshoot)