diff --git a/.gitattributes b/.gitattributes index 8749e12..de5bd3d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -# MAS export-ignore -# LICENSE export-ignore -# README.md export-ignore +MAS export-ignore +LICENSE export-ignore +README.md export-ignore .gitattributes export-ignore diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd index 20a5790..7a8eaa9 100644 --- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd +++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd @@ -1,5 +1,5 @@ -@::yfh37fow-random -@set masver=3.4 +@::fh36d7f-random +@set masver=3.3 @setlocal DisableDelayedExpansion @echo off @@ -2423,7 +2423,6 @@ set error=1 goto :starto16c2r ) -call :oh_expiredpreview 2013 call :oh_fixprids call :oh_process if defined isOspp ( @@ -2481,7 +2480,6 @@ set error=1 goto :startmsi ) -call :oh_expiredpreview 2016 2019 2021 2024 call :oh_fixprids call :oh_process if defined isOspp ( @@ -2741,21 +2739,6 @@ 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 ( @@ -4114,8 +4097,6 @@ if !_el!==1 cls & setlocal & set "_actwin=1" & call :ts_start & endlocal goto :ts_menu ) -goto :ts_start - ::======================================================================================================================================== :ts_changemethod @@ -4128,29 +4109,28 @@ echo: echo: echo ______________________________________________________________ echo: -call :dk_color2 %_White% " [1] " %_Green% "Auto" -echo Builds ^>= 19041 - StaticCID (KMS4k if offline) -echo Builds ^< 19041 - ZeroCID -echo __________________________________________________ +call :dk_color2 %_White% " [1] " %_Green% " Auto" +echo Build 19041 and later: +echo Uses StaticCID, or KMS4k if offline. +echo Older builds: Uses ZeroCID. +echo _______________________________________________ echo: -echo [2] StaticCID -echo Needs Internet -echo Not for Windows 7 or older -echo __________________________________________________ +echo [2] StaticCID +echo Needs Internet. +echo Not for Windows 7 or older. +echo _______________________________________________ echo: -echo [3] ZeroCID -echo Works reliably on builds below 19041 -echo May break on builds between 19041-26100 -echo Does not work on builds above 26100.4188 -echo __________________________________________________ +echo [3] ZeroCID +echo Works only on builds below 19041. +echo _______________________________________________ echo: -echo [4] KMS4k -echo Volume licenses only -echo Activates for 4000+ years -echo __________________________________________________ +echo [4] KMS4k +echo This applies only to volume products. +echo Activates for 4000+ years using KMS. +echo _______________________________________________ echo: -echo [5] Learn More -echo [0] %_exitmsg% +echo [5] Learn More +echo [0] %_exitmsg% echo ______________________________________________________________ echo: call :dk_color2 %_White% " " %_Green% "Choose a menu option using your keyboard..." @@ -4997,7 +4977,6 @@ set error=1 goto :ts_starto16c2r ) -call :oh_expiredpreview 2013 if "%_actprojvis%"=="0" call :oh_fixprids call :ts_process @@ -5039,7 +5018,6 @@ set error=1 goto :ts_startmsi ) -call :oh_expiredpreview 2016 2019 2021 2024 if "%_actprojvis%"=="0" call :oh_fixprids call :ts_process @@ -12985,7 +12963,6 @@ set error=1 goto :ks_starto16c2r ) -call :oh_expiredpreview 2013 if "%_actprojvis%"=="0" call :oh_fixprids call :ks_process @@ -13026,7 +13003,6 @@ set error=1 goto :ks_startmsi ) -call :oh_expiredpreview 2016 2019 2021 2024 if "%_actprojvis%"=="0" call :oh_fixprids call :ks_process @@ -13939,8 +13915,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.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%-%xi.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.0%-%t.net.cn win.k%-%ms.pub kms.wx%-%lost.com kms.moe%-%yuuko.top kms.gh%-%pym.com" set n=1 for %%a in (%srvlist%) do (set %%a=&set server!n!=%%a&set /a n+=1) diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd index 3224434..3f46cb3 100644 --- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd index 3e9e4d5..e2190ac 100644 --- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd index 93b5c80..60e7a5c 100644 --- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd +++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off @@ -614,7 +614,6 @@ set error=1 goto :starto16c2r ) -call :oh_expiredpreview 2013 call :oh_fixprids call :oh_process if defined isOspp ( @@ -672,7 +671,6 @@ set error=1 goto :startmsi ) -call :oh_expiredpreview 2016 2019 2021 2024 call :oh_fixprids call :oh_process if defined isOspp ( @@ -932,21 +930,6 @@ 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 ( diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd index eb43119..27e539a 100644 --- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off @@ -876,7 +876,6 @@ set error=1 goto :ks_starto16c2r ) -call :oh_expiredpreview 2013 if "%_actprojvis%"=="0" call :oh_fixprids call :ks_process @@ -917,7 +916,6 @@ set error=1 goto :ks_startmsi ) -call :oh_expiredpreview 2016 2019 2021 2024 if "%_actprojvis%"=="0" call :oh_fixprids call :ks_process @@ -1098,21 +1096,6 @@ 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 @@ -2154,8 +2137,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.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%-%xi.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.0%-%t.net.cn win.k%-%ms.pub kms.wx%-%lost.com kms.moe%-%yuuko.top kms.gh%-%pym.com" set n=1 for %%a in (%srvlist%) do (set %%a=&set server!n!=%%a&set /a n+=1) diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd index 27307cb..4c625e9 100644 --- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off @@ -497,8 +497,6 @@ if !_el!==1 cls & setlocal & set "_actwin=1" & call :ts_start & endlocal goto :ts_menu ) -goto :ts_start - ::======================================================================================================================================== :ts_changemethod @@ -511,29 +509,28 @@ echo: echo: echo ______________________________________________________________ echo: -call :dk_color2 %_White% " [1] " %_Green% "Auto" -echo Builds ^>= 19041 - StaticCID (KMS4k if offline) -echo Builds ^< 19041 - ZeroCID -echo __________________________________________________ +call :dk_color2 %_White% " [1] " %_Green% " Auto" +echo Build 19041 and later: +echo Uses StaticCID, or KMS4k if offline. +echo Older builds: Uses ZeroCID. +echo _______________________________________________ echo: -echo [2] StaticCID -echo Needs Internet -echo Not for Windows 7 or older -echo __________________________________________________ +echo [2] StaticCID +echo Needs Internet. +echo Not for Windows 7 or older. +echo _______________________________________________ echo: -echo [3] ZeroCID -echo Works reliably on builds below 19041 -echo May break on builds between 19041-26100 -echo Does not work on builds above 26100.4188 -echo __________________________________________________ +echo [3] ZeroCID +echo Works only on builds below 19041. +echo _______________________________________________ echo: -echo [4] KMS4k -echo Volume licenses only -echo Activates for 4000+ years -echo __________________________________________________ +echo [4] KMS4k +echo This applies only to volume products. +echo Activates for 4000+ years using KMS. +echo _______________________________________________ echo: -echo [5] Learn More -echo [0] %_exitmsg% +echo [5] Learn More +echo [0] %_exitmsg% echo ______________________________________________________________ echo: call :dk_color2 %_White% " " %_Green% "Choose a menu option using your keyboard..." @@ -1380,7 +1377,6 @@ set error=1 goto :ts_starto16c2r ) -call :oh_expiredpreview 2013 if "%_actprojvis%"=="0" call :oh_fixprids call :ts_process @@ -1422,7 +1418,6 @@ set error=1 goto :ts_startmsi ) -call :oh_expiredpreview 2016 2019 2021 2024 if "%_actprojvis%"=="0" call :oh_fixprids call :ts_process @@ -2004,21 +1999,6 @@ 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 diff --git a/MAS/Separate-Files-Version/Change_Office_Edition.cmd b/MAS/Separate-Files-Version/Change_Office_Edition.cmd index f83e68c..6cf421e 100644 --- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd +++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off diff --git a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd index 905b584..6020c87 100644 --- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd +++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd index 7fa15af..63a4ad9 100644 --- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd +++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off diff --git a/MAS/Separate-Files-Version/Troubleshoot.cmd b/MAS/Separate-Files-Version/Troubleshoot.cmd index aebe72b..c10657e 100644 --- a/MAS/Separate-Files-Version/Troubleshoot.cmd +++ b/MAS/Separate-Files-Version/Troubleshoot.cmd @@ -1,4 +1,4 @@ -@set masver=3.4 +@set masver=3.3 @echo off diff --git a/README.md b/README.md index 53a01b9..1f55758 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,8 @@ or --- ``` -Latest Version: 3.4 -Release date: 3-June-2025 +Latest Version: 3.3 +Release date: 1-June-2025 ``` ### [Troubleshooting / Help](https://massgrave.dev/troubleshoot)