Skip to content

Commit b437c8e

Browse files
committed
v2.12
1 parent 59fdf5e commit b437c8e

File tree

18 files changed

+160
-42
lines changed

18 files changed

+160
-42
lines changed

#Installer/VariableFiles.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
@Resources\Vars.inc
1+
@Resources\Vars.inc
2+
Main\Vars\Arc.inc
3+
Main\Vars\Center.inc
4+
Main\Vars\CircTech.inc
5+
Main\Vars\Graph.inc
6+
Main\Vars\Light.inc
7+
Main\Vars\Measure.inc
8+
Main\Vars\Smart.inc
9+
Main\Vars\Tech.inc
10+
Main\Vars\Text.inc

@Resources/Vars.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ColorMode=0
77
MainColor=12,12,12
88
OppositeColor=255,255,255
99

10-
Style=Center
10+
Style=Measure
1111

1212
Rm.Update=25
1313
Render=Color

@Resources/Version.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[Variables]
2-
Version=2.11
2+
Version=2.12

@Start/DownloadFile/Parsed.inc

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ This=0 | 0,0,0,150 ; 0.0 | 0,0,0,0 ; 1.0
9090

9191
[Logo]
9292
Meter=Image
93-
ImageName=Logo.png
93+
ImageName=CoreAssets\#Set.IconStyle#Logo.png
9494
X=#Sec.P#
9595
Y=(#Sec.H#-#Sec.P#-40)
9696
W=40
@@ -104,7 +104,6 @@ Container=BC
104104
H=#Sec.H#
105105
W=#Sec.L#
106106
PreserveAspectRatio=2
107-
Leftmouseupaction=[!Refresh]
108107
ImageName=#ROOTCONFIG#.png
109108

110109
[Esc]
@@ -136,7 +135,7 @@ MeterStyle=String:S
136135

137136
[Des]
138137
Meter=String
139-
Text=Here you can find the list of dependencies. Click on any one of them to install, make sure you are connected to the internet. Refresh this page by clicking on the right.
138+
Text=Here you can find the list of dependencies. Click on any one of them to install, make sure you are connected to the internet.
140139
W=(#SEc.W#-#Sec.L#-#Sec.P#*2)
141140
clipString=2
142141
MeterStyle=String:S
@@ -199,12 +198,20 @@ Group=Button
199198
; ---------------------------------------------------------------------------- ;
200199

201200
[WebParser]
202-
Measure=WebParser
203-
URL=https://raw.githubusercontent.com/Jax-Core/JaxCore/main/%40Resources/Version.inc
204-
RegExp==(.*)$
205-
FinishAction=[!Delay 1000][!CommandMeasure LogicalScript "check()"]
201+
Measure=Calc
202+
203+
Formula=40000
204+
;URL=https://raw.githubusercontent.com/Jax-Core/JaxCore/main/%40Resources/Version.inc
205+
;RegExp==(.*)$
206+
OnUpdateAction=[!Delay 1000][!CommandMeasure LogicalScript "check()"]
206207
OnConnectionErrorAction=[!SetOption Dep1 MeterStyle "Dep.Shape:S | Dep.ShapeNo:S"][!SetOption DepText1 Text "//Failed to connect to JaxCore github, if this is an issue please report to me"][!UpdateMEter *][!Redraw]
207208
OnRegExpErrorAction=[!Log Developer:RegExpFalse]
209+
Disabled=1
210+
211+
[WebParserCheck]
212+
Measure=Calc
213+
IfCondition=#Parsed# = 1
214+
IfTrueAction=[!EnableMeasure WebParser][!UpdateMeasure WebParser][!CommandMeasure WebParser "Reset"]
208215

209216
[InternetStatus]
210217
Measure=PLUGIN

@Start/Main.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ IfNotMatchAction=[!WriteKeyValue Variables Parsed 0]
1515

1616
[GetStart]
1717
Measure=WebParser
18-
URL=https://raw.githubusercontent.com/Jax-Core/JaxCore/main/Core/Start/Main.inc
18+
URL=https://raw.githubusercontent.com/Jax-Core/JaxCore/main/CoreShell/Start/Main.inc
1919
Download=1
2020
DownloadFile=Parsed.inc
2121

Core/Appearance.inc

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ OnUpdateAction=[!SetOption #Style# MeterStyle "Box:Selected"][!UpdateMeter #Styl
1010

1111

1212
[DefaultStartActions]
13-
Custom2=[!UpdateMeterGroup PReload][!SHowMeterGroup V#VersionPage#][!UpdateMeter *][!Redraw]
13+
Custom1=[!UpdateMeterGroup PReload][!SHowMeterGroup V#VersionPage#][!UpdateMeter *][!Redraw]
1414

1515
[Input2:M]
1616
Measure=Plugin
@@ -271,13 +271,3 @@ MeterStyle=Set.Div:S
271271
@includeCore=#SKINSPATH##Skin.Name#\Core\Appearance\#Style#.inc
272272

273273
@includeStyleVars=#SKINSPATH##Skin.Name#\Main\Styles\Vars\#Style#.inc
274-
; ---------------------------------------------------------------------------- ;
275-
; Anchor ;
276-
; ---------------------------------------------------------------------------- ;
277-
278-
279-
[AnchorSuppli]
280-
Meter=String
281-
Container=ContentContainer
282-
x=r
283-
Y=R

Core/Appearance/Arc.inc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,15 @@ Y=([Option06:Y]-#Set.P#+(-30/2+8)*[Set.S])
2828
Meter=Shape
2929
MeterStyle=Set.Color:S
3030
Hidden=(1-[&Func:returnBool('Render', 'Color')])
31-
Y=([Option07:Y]-#Set.P#+(-30/2+8)*[Set.S])
31+
Y=([Option07:Y]-#Set.P#+(-30/2+8)*[Set.S])
32+
33+
; ---------------------------------------------------------------------------- ;
34+
; Anchor ;
35+
; ---------------------------------------------------------------------------- ;
36+
37+
38+
[AnchorSuppli]
39+
Meter=String
40+
Container=ContentContainer
41+
x=r
42+
Y=R

Core/Appearance/Center.inc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,15 @@ Y=([Option06:Y]-#Set.P#+(-30/2+8)*[Set.S])
1717
Meter=String
1818
Text=#PrimaryOpacity#
1919
Hidden=(1-[&Func:returnBool('Render', 'Color')])
20-
MeterStyle=Set.String:S | Set.Pacity:S
20+
MeterStyle=Set.String:S | Set.Pacity:S
21+
22+
; ---------------------------------------------------------------------------- ;
23+
; Anchor ;
24+
; ---------------------------------------------------------------------------- ;
25+
26+
27+
[AnchorSuppli]
28+
Meter=String
29+
Container=ContentContainer
30+
x=r
31+
Y=R

Core/Appearance/Graph.inc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,15 @@ Y=([Option09:Y]-#Set.P#+(-30/2+8)*[Set.S])
6565
Meter=String
6666
Text=#LineOpacity#
6767
Hidden=(1-[&Func:returnBool('Render', 'Color')])
68-
MeterStyle=Set.String:S | Set.Pacity:S
68+
MeterStyle=Set.String:S | Set.Pacity:S
69+
70+
; ---------------------------------------------------------------------------- ;
71+
; Anchor ;
72+
; ---------------------------------------------------------------------------- ;
73+
74+
75+
[AnchorSuppli]
76+
Meter=String
77+
Container=ContentContainer
78+
x=r
79+
Y=R

Core/Appearance/Light.inc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,15 @@ Y=([Option06:Y]-#Set.P#+(-30/2+8)*[Set.S])
1717
Meter=String
1818
Text=#PrimaryOpacity#
1919
Hidden=(1-[&Func:returnBool('Render', 'Color')])
20-
MeterStyle=Set.String:S | Set.Pacity:S
20+
MeterStyle=Set.String:S | Set.Pacity:S
21+
22+
; ---------------------------------------------------------------------------- ;
23+
; Anchor ;
24+
; ---------------------------------------------------------------------------- ;
25+
26+
27+
[AnchorSuppli]
28+
Meter=String
29+
Container=ContentContainer
30+
x=r
31+
Y=R

0 commit comments

Comments
 (0)