diff --git a/@Resources/Includes/Window.ini b/@Resources/Includes/Window.ini index 62c0fbc..474fae3 100644 --- a/@Resources/Includes/Window.ini +++ b/@Resources/Includes/Window.ini @@ -9,10 +9,10 @@ ScaleWindowW=1000 ; ---------------------------------------------------------------------------- ; ; CacheWindowVariables ; ; ---------------------------------------------------------------------------- ; -WindowPosX=405 -WindowPosY=52 -Set.W=1092 -Set.H=821 +WindowPosX=2289 +WindowPosY=214 +Set.W=865 +Set.H=771 ; ---------------------------- Important variables --------------------------- ; WindowMaximized=0 WindowDragMarginSize=6 diff --git a/@Resources/Powershell/AddShortcut.ps1 b/@Resources/Powershell/AddShortcut.ps1 index f942f66..40a2ee0 100644 --- a/@Resources/Powershell/AddShortcut.ps1 +++ b/@Resources/Powershell/AddShortcut.ps1 @@ -22,15 +22,15 @@ function Check { } function Desktop { - Copy-Item -Path "../../Main/Shortcut/#CoreHome.lnk" -Destination "$DesktopPath" + Copy-Item -Path "../../Accessories/Shortcut/#CoreHome.lnk" -Destination "$DesktopPath" } function StartFolder { - Copy-Item -Path "../../Main/Shortcut/#CoreHome.lnk" -Destination "$Startpath\Microsoft\Windows\Start Menu\Programs" + Copy-Item -Path "../../Accessories/Shortcut/#CoreHome.lnk" -Destination "$Startpath\Microsoft\Windows\Start Menu\Programs" } function RemoveDeskop { - Remove-Item "$DesktopPath\#CoreHome.lnk" + Remove-Item "$DesktopPath\#CoreHome.lnk" -Recurse } function RemoveStartFolder { diff --git a/@Resources/SecVar.inc b/@Resources/SecVar.inc index 4becfab..7d052e7 100644 --- a/@Resources/SecVar.inc +++ b/@Resources/SecVar.inc @@ -1,6 +1,6 @@ [Variables] -Skin.Name=Keylaunch +Skin.Name=ModularClocks ; Skin.Shorthand= -Skin.Set_Page=Info +Skin.Set_Page=Appearance Skin.Ctx_Ctx=Refresh diff --git a/@Resources/Vars.inc b/@Resources/Vars.inc index 6ce5001..a9efa83 100644 --- a/@Resources/Vars.inc +++ b/@Resources/Vars.inc @@ -1,5 +1,5 @@ [Variables] -UserNameCheckVariable=Jax Tam +UserNameCheckVariable=Jax Tam LastVersionNumber=00000 ; ----------------------------- Scaling variables ---------------------------- ; ; Set.S=0.9 @@ -24,4 +24,4 @@ Core.Master=3 [Set.S] Measure=Calc -Formula=0.9 +Formula=0.87 diff --git a/@Resources/Version.inc b/@Resources/Version.inc index a73226e..d972046 100644 --- a/@Resources/Version.inc +++ b/@Resources/Version.inc @@ -1,2 +1,2 @@ [Variables] -Core.Ver=00032 +Core.Ver=00033 diff --git a/Accessories/Shortcut/#CoreHome.lnk b/Accessories/Shortcut/#CoreHome.lnk new file mode 100644 index 0000000..6040dc7 Binary files /dev/null and b/Accessories/Shortcut/#CoreHome.lnk differ diff --git a/Accessories/Tour/5.inc b/Accessories/Tour/5.inc index 1a3ea0d..4853b1c 100644 --- a/Accessories/Tour/5.inc +++ b/Accessories/Tour/5.inc @@ -69,16 +69,16 @@ MeterStyle=Set.String:S | SupportText:S Meter=Shape Y=10R MeterStyle=Support:S -LeftMouseUpAction=["https://www.deviantart.com/jaxoriginals"] +LeftMouseUpAction=["https://discord.gg/JmgehPSDD6"] [SupportImage.2] Meter=Image X=(#Sec.W#/2-([#CURRENTSECTION#:W]+[SupportText.2:W]+5)/2) -ImageName=#@#Icons\Comment.png -ImageTint=#SET.Accent_Color# +ImageName=#@#Icons\Discord.png +ImageTint=108, 130, 206 MeterStyle=SupportImage:S [SupportText.2] MEter=String -Text=Give feedback on skins +Text=Join my discord server! MeterStyle=Set.String:S | SupportText:S ; ---------------------------------------------------------------------------- ; diff --git a/Core/#SettingsC.inc b/Core/#SettingsC.inc index 3ca8b1f..69f75e1 100644 --- a/Core/#SettingsC.inc +++ b/Core/#SettingsC.inc @@ -55,20 +55,20 @@ Meter=String Text=Appearance DynamicVariables-1 MeterStyle=Set.String:S | PageText:S -[Layout] +[Render] Meter=Shape Y=(10*[Set.S])R MeterStyle=PageBox:S -Fill=Fill Color #Set.Accent_Color#,(#BarHandler# = 4 ? 255: 0) -Handle=4 +Fill=Fill Color #Set.Accent_Color#,(#BarHandler# = 6 ? 255: 0) +Handle=6 -[LayoutIcon] +[RenderIcon] Meter=Image MeterStyle=PageIcon:S -Greyscale=(#BarHandler# = 4 ? 1 : 0) +Greyscale=(#BarHandler# = 6 ? 1 : 0) -[4] +[6] Meter=String -Text=Layout +Text=Render DynamicVariables-1 MeterStyle=Set.String:S | PageText:S diff --git a/Ctx/#ContextC.inc b/Ctx/#ContextC.inc index 922f3b4..e3e319e 100644 --- a/Ctx/#ContextC.inc +++ b/Ctx/#ContextC.inc @@ -4,7 +4,7 @@ MeterStyle=CtxBox:S Fill=Fill Color #Set.Pri_Color#,0 MouseOverAction=[!SetOption #CURRENTSECTION# Fill "Fill Color #Set.Pri_Color#,110"][!SetOption #CURRENTSECTION#Icon ImageTint "234,234,230"][!SetOption 3 FontColor "234,234,230"][!UpdateMeter *][!Redraw] MouseLeaveAction=[!SetOption #CURRENTSECTION# Fill "Fill Color #Set.Pri_Color#,0"][!SetOption #CURRENTSECTION#Icon ImageTint "#Set.Pri_Color#"][!SetOption 3 FontColor "#Set.Pri_Color#"][!UpdateMeter *][!Redraw] -LeftMouseUpAction=[!Move (1920/2-(1097)/2) (1080/2-(821)/2) "#Sec.Skin#\Main"][!DeactivateConfig] +LeftMouseUpAction=[!Move (1920/2-(870)/2) (1080/2-(771)/2) "#Sec.Skin#\Main"][!DeactivateConfig] DynamicVariables=1 [CenterIcon] Meter=Image diff --git a/SecOverrides/Keystrokes/Layout.inc b/SecOverrides/Keystrokes/Layout.inc index c2ddb8d..c15e795 100644 --- a/SecOverrides/Keystrokes/Layout.inc +++ b/SecOverrides/Keystrokes/Layout.inc @@ -1,5 +1,5 @@ [Variables] -Temp.Layout=WASD +Temp.Layout=QWERTY Temp.Circ=1 Temp.Mouse=1 diff --git a/SecOverrides/ModularClocks/Appearance.inc b/SecOverrides/ModularClocks/Appearance.inc index f73fedc..89563d9 100644 --- a/SecOverrides/ModularClocks/Appearance.inc +++ b/SecOverrides/ModularClocks/Appearance.inc @@ -45,7 +45,7 @@ InlineSetting2=Color | 150,150,150 ;================================================================================================================================================================================ [Variables] -VersionPage=2 +VersionPage=1 ;================================================================================================================================================================================ @@ -128,7 +128,7 @@ Y=r MeterStyle=Box [BoxAdd] Meter=Shape -X=30 +X=362 Y=r DynamicVariables=1 Fill=Fill Color 255,255,255,50