Revert export-ignore

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

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

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

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

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

@@ -1,4 +1,4 @@
-@set masver=3.2
+@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.2
+@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.0%-%t.net.cn win.k%-%ms.pub kms.wx%-%lost.com kms.moe%-%yuuko.top kms.gh%-%pym.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 n=1
 for %%a in (%srvlist%) do (set %%a=&set server!n!=%%a&set /a n+=1)

MAS/Separate-Files-Version/Change_Office_Edition.cmd

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

MAS/Separate-Files-Version/Change_Windows_Edition.cmd

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

MAS/Separate-Files-Version/Extract_OEM_Folder.cmd

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

MAS/Separate-Files-Version/Troubleshoot.cmd

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

README.md

@@ -1,118 +1,116 @@
-<p align="center"><img src="https://massgrave.dev/img/logo_small.png" alt="MAS Logo"></p>
-
-<h1 align="center">Microsoft  Activation  Scripts (MAS)</h1>
-
-<p align="center">Open-source Windows and Office activator featuring HWID, Ohook, TSforge, KMS38, and Online KMS activation methods, along with advanced troubleshooting.</p>
-
-<hr>
-  
-## How to Activate Windows / Office?
-
-### Method 1 - PowerShell (Windows 8 and later) ❤️
-
-1.   **Open PowerShell**  
-	To do that, press the Windows key + X, then select PowerShell or Terminal.
-
-2.   **Copy and paste the code below, then press enter.**  
-```
-irm https://get.activated.win | iex
-```
-Alternatively, you can use the following (this will be deprecated in the future):  
-```
-irm https://massgrave.dev/get | iex
-```
-
-3.   You will see the activation options.  
-	   Press 1 HWID for Windows activation.  
-     Press 2 Ohook for Office activation.
-
-4.   That's all
-
----
-
-### Method 2 - Traditional (Windows Vista and later)
-
-<details>
-  <summary>Click here to view</summary>
-  
-1.   Download the file using one of the links below:  
-`https://github.com/massgravel/Microsoft-Activation-Scripts/archive/refs/heads/master.zip`  
-or  
-`https://git.activated.win/massgrave/Microsoft-Activation-Scripts/archive/master.zip`
-2.   Right-click on the downloaded zip file and extract it.
-3.   In the extracted folder, find the folder named `All-In-One-Version`.
-4.   Run the file named `MAS_AIO.cmd`.
-5.   You will see the activation options. Follow the on-screen instructions.
-6.   That's all.
-
-</details>
-
----
-
-- **[Office for macOS](https://massgrave.dev/office_for_mac)**
-- To run the scripts in unattended mode, check [here](https://massgrave.dev/command_line_switches).
-
----
-
-### Not working ❓
-
-- If you are **unable to launch MAS** using the PowerShell method, please refer to **Method 2** listed above.
-- If MAS is launched and the script shows any errors, check for any troubleshooting steps mentioned in blue color and try to follow those.
-- If you have any issues, please feel free to reach out to us [here](https://massgrave.dev/troubleshoot).
-
----
-
-> [!NOTE]
->
-> - The IRM command in PowerShell downloads a script from a specified URL, and the IEX command executes it.
-> - Always double-check the URL before executing the command and verify the source if manually downloading files.
-> - Be cautious, as some spread malware disguised as MAS by using different URLs in the IRM command.
-
----
-
-```
-Latest Version: 3.2
-Release date: 6-May-2025
-```
-
-### [Troubleshooting / Help](https://massgrave.dev/troubleshoot)
-### [Download Original Windows & Office](https://massgrave.dev/genuine-installation-media)
-### Homepage - [https://massgrave.dev/](https://massgrave.dev/)
-
-<div align="center">
-  
-[![1.1]][1]
-[![1.2]][2]
-[![1.3]][3]
-
-</div>
-
-<div align="center">
-  
-[![1.4]][4]
-[![1.5]][5]
-[![1.6]][6]
-[![1.7]][7]
-
-</div>
-
-[1.1]: https://massgrave.dev/img/logo_github.png (GitHub)
-[1.2]: https://massgrave.dev/img/logo_azuredevops.png (AzureDevOps)
-[1.3]: https://massgrave.dev/img/logo_gitea.png (Self-hosted Git)
-
-[1.4]: https://massgrave.dev/img/logo_discord.png (Chat with us without signup)
-[1.5]: https://massgrave.dev/img/logo_reddit.png (Reddit)
-[1.6]: https://massgrave.dev/img/logo_bluesky.png (Bluesky)
-[1.7]: https://massgrave.dev/img/logo_x.png (Twitter)
-
-[1]: https://github.com/massgravel/Microsoft-Activation-Scripts
-[2]: https://dev.azure.com/massgrave/_git/Microsoft-Activation-Scripts
-[3]: https://git.activated.win/massgrave/Microsoft-Activation-Scripts
-[4]: https://discord.gg/j2yFsV5ZVC
-[5]: https://www.reddit.com/r/MAS_Activator
-[6]: https://bsky.app/profile/massgrave.dev
-[7]: https://twitter.com/massgravel
-
----
-
-<p align="center">Made with Love ❤️</p>
+<p align="center"><img src="https://massgrave.dev/img/logo_small.png" alt="MAS Logo"></p>
+
+<h1 align="center">Microsoft  Activation  Scripts (MAS)</h1>
+
+<p align="center">Open-source Windows and Office activator featuring HWID, Ohook, TSforge, KMS38, and Online KMS activation methods, along with advanced troubleshooting.</p>
+
+<hr>
+  
+## How to Activate Windows / Office?
+
+### Method 1 - PowerShell (Windows 8 and later) ❤️
+
+1.   **Open PowerShell**  
+	To do that, press the Windows key + X, then select PowerShell or Terminal.
+
+2.   **Copy and paste the code below, then press enter.**  
+```
+irm https://get.activated.win | iex
+```
+Alternatively, you can use the following (this will be deprecated in the future):  
+```
+irm https://massgrave.dev/get | iex
+```
+
+3.   You will see the activation options. Choose the activation options highlighted in green. 
+
+4.   That's all
+
+---
+
+### Method 2 - Traditional (Windows Vista and later)
+
+<details>
+  <summary>Click here to view</summary>
+  
+1.   Download the file using one of the links below:  
+`https://github.com/massgravel/Microsoft-Activation-Scripts/archive/refs/heads/master.zip`  
+or  
+`https://git.activated.win/massgrave/Microsoft-Activation-Scripts/archive/master.zip`
+2.   Right-click on the downloaded zip file and extract it.
+3.   In the extracted folder, find the folder named `All-In-One-Version`.
+4.   Run the file named `MAS_AIO.cmd`.
+5.   You will see the activation options. Follow the on-screen instructions.
+6.   That's all.
+
+</details>
+
+---
+
+- To activate additional products such as **Office for macOS, Visual Studio, RDS CALs, and Windows XP**, check [here](https://massgrave.dev/unsupported_products_activation).
+- To run the scripts in unattended mode, check [here](https://massgrave.dev/command_line_switches).
+
+---
+
+### Not working ❓
+
+- If you are **unable to launch MAS** using the PowerShell method, please refer to **Method 2** listed above.
+- If MAS is launched and the script shows any errors, check for any troubleshooting steps mentioned in blue color and try to follow those.
+- If you have any issues, please feel free to reach out to us [here](https://massgrave.dev/troubleshoot).
+
+---
+
+> [!NOTE]
+>
+> - The IRM command in PowerShell downloads a script from a specified URL, and the IEX command executes it.
+> - Always double-check the URL before executing the command and verify the source if manually downloading files.
+> - Be cautious, as some spread malware disguised as MAS by using different URLs in the IRM command.
+
+---
+
+```
+Latest Version: 3.4
+Release date: 3-June-2025
+```
+
+### [Troubleshooting / Help](https://massgrave.dev/troubleshoot)
+### [Download Original Windows & Office](https://massgrave.dev/genuine-installation-media)
+### Homepage - [https://massgrave.dev/](https://massgrave.dev/)
+
+<div align="center">
+  
+[![1.1]][1]
+[![1.2]][2]
+[![1.3]][3]
+
+</div>
+
+<div align="center">
+  
+[![1.4]][4]
+[![1.5]][5]
+[![1.6]][6]
+[![1.7]][7]
+
+</div>
+
+[1.1]: https://massgrave.dev/img/logo_github.png (GitHub)
+[1.2]: https://massgrave.dev/img/logo_azuredevops.png (AzureDevOps)
+[1.3]: https://massgrave.dev/img/logo_gitea.png (Self-hosted Git)
+
+[1.4]: https://massgrave.dev/img/logo_discord.png (Chat with us without signup)
+[1.5]: https://massgrave.dev/img/logo_reddit.png (Reddit)
+[1.6]: https://massgrave.dev/img/logo_bluesky.png (Bluesky)
+[1.7]: https://massgrave.dev/img/logo_x.png (Twitter)
+
+[1]: https://github.com/massgravel/Microsoft-Activation-Scripts
+[2]: https://dev.azure.com/massgrave/_git/Microsoft-Activation-Scripts
+[3]: https://git.activated.win/massgrave/Microsoft-Activation-Scripts
+[4]: https://discord.gg/j2yFsV5ZVC
+[5]: https://www.reddit.com/r/MAS_Activator
+[6]: https://bsky.app/profile/massgrave.dev
+[7]: https://twitter.com/massgravel
+
+---
+
+<p align="center">Made with Love ❤️</p>