DutchEllie/Microsoft-Activation-Scripts
1
0
Fork 0
mirror of https://github.com/massgravel/Microsoft-Activation-Scripts.git synced 2025-12-03 03:35:53 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: DutchEllie:77c4bacde6a6c6370a02ebd4638a81ecbd5f32fb
Branches Tags
DutchEllie:master
DutchEllie:dev
DutchEllie:3.9
DutchEllie:3.8
DutchEllie:3.7
DutchEllie:3.6
DutchEllie:3.5
DutchEllie:3.4
DutchEllie:3.3
DutchEllie:3.2
DutchEllie:3.1
DutchEllie:3.0
DutchEllie:2.9
DutchEllie:2.8
DutchEllie:2.7
DutchEllie:2.6
DutchEllie:2.5
DutchEllie:2.4
DutchEllie:2.3
DutchEllie:2.2
DutchEllie:2.1
DutchEllie:2.0
DutchEllie:1.9
DutchEllie:1.8
DutchEllie:1.7
DutchEllie:1.6
DutchEllie:1.5
DutchEllie:1.4
DutchEllie:1.3
DutchEllie:1.2
..
compare: DutchEllie:470d3b900e6aebfba224fde3ea7957308dd61230
Branches Tags
DutchEllie:master
DutchEllie:dev
DutchEllie:3.9
DutchEllie:3.8
DutchEllie:3.7
DutchEllie:3.6
DutchEllie:3.5
DutchEllie:3.4
DutchEllie:3.3
DutchEllie:3.2
DutchEllie:3.1
DutchEllie:3.0
DutchEllie:2.9
DutchEllie:2.8
DutchEllie:2.7
DutchEllie:2.6
DutchEllie:2.5
DutchEllie:2.4
DutchEllie:2.3
DutchEllie:2.2
DutchEllie:2.1
DutchEllie:2.0
DutchEllie:1.9
DutchEllie:1.8
DutchEllie:1.7
DutchEllie:1.6
DutchEllie:1.5
DutchEllie:1.4
DutchEllie:1.3
DutchEllie:1.2

No commits in common. "77c4bacde6a6c6370a02ebd4638a81ecbd5f32fb" and "470d3b900e6aebfba224fde3ea7957308dd61230" have entirely different histories.
77c4bacde6 ... 470d3b900e

3 changed files with 29 additions and 30 deletions
Show Stats Expand all files Collapse all files

21
MAS/All-In-One-Version-KL/MAS_AIO.cmd
View File

@ -453,7 +453,6 @@ if %winbuild% GEQ 10240 if %winbuild% LEQ 19045 if not defined _serexist if not
call :dk_color2 %_Green% " Tip:" %_White% " To activate ESU updates after W10 EOL, use TSforge option."
)
echo:
echo:
echo: ______________________________________________________________
echo:
echo: Activation Methods:
@ -574,14 +573,14 @@ echo:
echo: Extract $OEM$ folder on the desktop
echo: ____________________________________________________________
echo:
echo: [1] HWID [Windows]
echo: [2] Ohook [Office]
echo: [3] TSforge [Windows / ESU / Office]
echo: [4] Online KMS [Windows / Office]
echo: [1] HWID [Windows]
echo: [2] Ohook [Office]
echo: [3] TSforge [Windows / ESU / Office]
echo: [4] Online KMS [Windows / Office]
echo:
echo: [5] HWID [Windows] ^+ Ohook [Office]
echo: [6] HWID [Windows] ^+ Ohook [Office] ^+ TSforge [ESU]
echo: [7] TSforge [Windows / ESU] ^+ Ohook [Office]
echo: [5] HWID [Windows] ^+ Ohook [Office]
echo: [6] HWID [Windows] ^+ Ohook [Office] ^+ TSforge [ESU]
echo: [7] TSforge [Windows] ^+ Online KMS [Office]
echo:
call :dk_color2 %_White% " [R] " %_Green% "ReadMe"
echo: [0] Go Back
@ -593,7 +592,7 @@ set _erl=%errorlevel%
if %_erl%==9 goto:Extras
if %_erl%==8 start %mas%oem-folder &goto:Extract$OEM$2
if %_erl%==7 (set "_oem=TSforge [Windows / ESU] + Ohook [Office]" & set "para=/Z-Windows /Z-ESU /Ohook" &goto:Extract$OEM$3)
if %_erl%==7 (set "_oem=TSforge [Windows] + Online KMS [Office]" & set "para=/Z-Windows /K-Office" &goto:Extract$OEM$3)
if %_erl%==6 (set "_oem=HWID [Windows] + Ohook [Office] + TSforge [ESU]" & set "para=/HWID /Ohook /Z-ESU" &goto:Extract$OEM$3)
if %_erl%==5 (set "_oem=HWID [Windows] + Ohook [Office]" & set "para=/HWID /Ohook" &goto:Extract$OEM$3)
if %_erl%==4 (set "_oem=Online KMS" & set "para=/K-WindowsOffice" &goto:Extract$OEM$3)
@ -5809,14 +5808,14 @@ $filteredResults = $results | Where-Object {
$true
}
else {
$_.Name -like "*ESU*" -or $_.Name -notlike "*CountrySpecific*"
$_.Name -notlike "*CountrySpecific*"
}
} | Where-Object {
if ($env:tsedition -like "*CloudEdition*") {
$true
}
else {
$_.Name -like "*ESU*" -or $_.Name -notlike "*CloudEdition*"
$_.Name -notlike "*CloudEdition*"
}
} | Where-Object {
$_.Name -like "*CountrySpecific*" -or (IsMuiNotLocked $_.ID)

4
MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
View File

@ -1872,14 +1872,14 @@ $filteredResults = $results | Where-Object {
$true
}
else {
$_.Name -like "*ESU*" -or $_.Name -notlike "*CountrySpecific*"
$_.Name -notlike "*CountrySpecific*"
}
} | Where-Object {
if ($env:tsedition -like "*CloudEdition*") {
$true
}
else {
$_.Name -like "*ESU*" -or $_.Name -notlike "*CloudEdition*"
$_.Name -notlike "*CloudEdition*"
}
} | Where-Object {
$_.Name -like "*CountrySpecific*" -or (IsMuiNotLocked $_.ID)

34
MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
View File

@ -444,14 +444,14 @@ echo:
echo: Extract $OEM$ folder on the desktop
echo: ____________________________________________________________
echo:
echo: [1] HWID [Windows]
echo: [2] Ohook [Office]
echo: [3] TSforge [Windows / ESU / Office]
echo: [4] Online KMS [Windows / Office]
echo: [1] HWID [Windows]
echo: [2] Ohook [Office]
echo: [3] TSforge [Windows / ESU / Office]
echo: [4] Online KMS [Windows / Office]
echo:
echo: [5] HWID [Windows] ^+ Ohook [Office]
echo: [6] HWID [Windows] ^+ Ohook [Office] ^+ TSforge [ESU]
echo: [7] TSforge [Windows / ESU] ^+ Ohook [Office]
echo: [5] HWID [Windows] ^+ Ohook [Office]
echo: [6] HWID [Windows] ^+ Ohook [Office] ^+ TSforge [ESU]
echo: [7] TSforge [Windows] ^+ Online KMS [Office]
echo:
call :dk_color2 %_White% " [R] " %_Green% "ReadMe"
echo: [0] Exit
@ -463,7 +463,7 @@ set _erl=%errorlevel%
if %_erl%==9 exit /b
if %_erl%==8 start %mas%oem-folder &goto :Menu
if %_erl%==7 goto:tsforge_ohook
if %_erl%==7 goto:tsforge_kms
if %_erl%==6 goto:hwid_ohook_tsforge
if %_erl%==5 goto:hwid_ohook
if %_erl%==4 goto:kms
@ -676,41 +676,41 @@ cd \
::========================================================================================================================================
:tsforge_ohook
:tsforge_kms
cls
md "!desktop!\$OEM$\$$\Setup\Scripts"
pushd "!_work!"
copy /y /b "%TSforge_Activation.cmd%" "!_dir!\TSforge_Activation.cmd" %nul%
copy /y /b "%Ohook_Activation_AIO.cmd%" "!_dir!\Ohook_Activation_AIO.cmd" %nul%
copy /y /b "%Online_KMS_Activation.cmd%" "!_dir!\Online_KMS_Activation.cmd" %nul%
popd
call :export tsforge_ohook_setup
call :export tsforge_kms_setup
set _error=
if not exist "!_dir!\TSforge_Activation.cmd" set _error=1
if not exist "!_dir!\Ohook_Activation_AIO.cmd" set _error=1
if not exist "!_dir!\Online_KMS_Activation.cmd" set _error=1
if not exist "!_dir!\SetupComplete.cmd" set _error=1
if defined _error goto errorfound
set oem=TSforge [Windows / ESU] + Ohook [Office]
set oem=TSforge [Windows] + Online KMS [Office]
goto done
:tsforge_ohook_setup:
:tsforge_kms_setup:
@echo off
fltmc >nul || exit /b
setlocal
call "%~dp0TSforge_Activation.cmd" /Z-Windows /Z-ESU
call "%~dp0TSforge_Activation.cmd" /Z-Windows
endlocal
setlocal
call "%~dp0Ohook_Activation_AIO.cmd" /Ohook
call "%~dp0Online_KMS_Activation.cmd" /K-Office
endlocal
cd \
(goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
:tsforge_ohook_setup:
:tsforge_kms_setup:
::========================================================================================================================================