Skip to content

Commit 7830b92

Browse files
benskubensku
committed
Merge origin/master
2 parents 7afa569 + 9487d65 commit 7830b92

File tree

6 files changed

+163
-163
lines changed

6 files changed

+163
-163
lines changed

‎+global-variations.sk‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ data values:
1212
magenta = - {Damage:2}
1313
light blue = - {Damage:3}
1414
yellow = - {Damage:4}
15-
(lime [green]|light green) = - {Damage:5}
15+
(lime|light green) = - {Damage:5}
1616
pink = - {Damage:6}
17-
[dark] gr(a|e)y = - {Damage:7}
18-
light gr(a|e)y = - {Damage:8}
17+
[dark] gray = - {Damage:7}
18+
light gray = - {Damage:8}
1919
cyan = - {Damage:9}
2020
purple = - {Damage:10}
2121
blue = - {Damage:11}
@@ -29,10 +29,10 @@ data values:
2929
magenta = - {Damage:13}
3030
light blue = - {Damage:12}
3131
yellow = - {Damage:11}
32-
(lime [green]|light green) = - {Damage:10}
32+
(lime|light green) = - {Damage:10}
3333
pink = - {Damage:9}
34-
[dark] gr(a|e)y = - {Damage:8}
35-
light gr(a|e)y = - {Damage:7}
34+
[dark] gray = - {Damage:8}
35+
light gray = - {Damage:7}
3636
cyan = - {Damage:6}
3737
purple = - {Damage:5}
3838
blue = - {Damage:4}
@@ -48,10 +48,10 @@ data values:
4848
magenta = minecraft:magenta_-
4949
light blue = minecraft:light_blue_-
5050
yellow = minecraft:yellow_-
51-
(lime [green]|light green) = minecraft:lime_-
51+
(lime|light green) = minecraft:lime_-
5252
pink = minecraft:pink_-
53-
[dark] gr(a|e)y = minecraft:gray_-
54-
light gr(a|e)y = minecraft:silver_-
53+
[dark] gray = minecraft:gray_-
54+
light gray = minecraft:silver_-
5555
cyan = minecraft:cyan_-
5656
purple = minecraft:purple_-
5757
blue = minecraft:blue_-
@@ -64,50 +64,50 @@ data values:
6464
# Dispenser, dropper, pistons, end rods.
6565
{orientable}:
6666
{default} = - {Damage:1}
67-
down[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
68-
up[ward[s]][( |-)(facing|pointing)] = - {Damage:1}
69-
north[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
70-
south[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
71-
west[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
72-
east[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
67+
down[ward] [facing] = - {Damage:0}
68+
up[ward] [facing] = - {Damage:1}
69+
north[ward] [facing] = - {Damage:2}
70+
south[ward] [facing] = - {Damage:3}
71+
west[ward] [facing] = - {Damage:4}
72+
east[ward] [facing] = - {Damage:5}
7373

7474
# For all stairs
7575
{stair direction}:
7676
{default} = - {Damage:0}
77-
[right[( |-)]side up] east[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
78-
[right[( |-)]side up] west[ward[s]][( |-)(facing|pointing)] = - {Damage:1}
79-
[right[( |-)]side up] south[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
80-
[right[( |-)]side up] north[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
81-
up[( |-)]side down east[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
82-
up[( |-)]side down west[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
83-
up[( |-)]side down south[ward[s]][( |-)(facing|pointing)] = - {Damage:6}
84-
up[( |-)]side down north[ward[s]][( |-)(facing|pointing)] = - {Damage:7}
77+
[right-side up] east[ward] [facing] = - {Damage:0}
78+
[right-side up] west[ward] [facing] = - {Damage:1}
79+
[right-side up] south[ward] [facing] = - {Damage:2}
80+
[right-side up] north[ward] [facing] = - {Damage:3}
81+
upside down east[ward] [facing] = - {Damage:4}
82+
upside down west[ward] [facing] = - {Damage:5}
83+
upside down south[ward] [facing] = - {Damage:6}
84+
upside down north[ward] [facing] = - {Damage:7}
8585

8686
# For blocks that can be attached to sides of another block, such as torches.
8787
{attached}:
8888
{default} = - {Damage:5}
89-
down[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
90-
east[ward[s]][( |-)(facing|pointing)] wall = - {Damage:1}
91-
west[ward[s]][( |-)(facing|pointing)] wall = - {Damage:2}
92-
south[ward[s]][( |-)(facing|pointing)] wall = - {Damage:3}
93-
north[ward[s]][( |-)(facing|pointing)] wall = - {Damage:4}
94-
up[ward[s]][( |-)(facing|pointing)]|floor = - {Damage:5}
89+
down[ward] [facing] = - {Damage:0}
90+
east[ward] [facing] wall = - {Damage:1}
91+
west[ward] [facing] wall = - {Damage:2}
92+
south[ward] [facing] wall = - {Damage:3}
93+
north[ward] [facing] wall = - {Damage:4}
94+
up[ward] [facing]|floor = - {Damage:5}
9595

9696
# For blocks that can be attached to sides of another block and toggled, namely buttons.
9797
{attached toggleable}:
9898
{default} = - {Damage:5}
99-
[(unpressed|inactive)] down[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
100-
[(unpressed|inactive)] east[ward[s]][( |-)(facing|pointing)] = - {Damage:1}
101-
[(unpressed|inactive)] west[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
102-
[(unpressed|inactive)] south[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
103-
[(unpressed|inactive)] north[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
104-
[(unpressed|inactive)] up[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
105-
(pressed|active) down[ward[s]][( |-)(facing|pointing)] = - {Damage:8}
106-
(pressed|active) east[ward[s]][( |-)(facing|pointing)] = - {Damage:9}
107-
(pressed|active) west[ward[s]][( |-)(facing|pointing)] = - {Damage:10}
108-
(pressed|active) south[ward[s]][( |-)(facing|pointing)] = - {Damage:11}
109-
(pressed|active) north[ward[s]][( |-)(facing|pointing)] = - {Damage:12}
110-
(pressed|active) up[ward[s]][( |-)(facing|pointing)] = - {Damage:13}
99+
[inactive] down[ward] [facing] = - {Damage:0}
100+
[inactive] east[ward] [facing] = - {Damage:1}
101+
[inactive] west[ward] [facing] = - {Damage:2}
102+
[inactive] south[ward] [facing] = - {Damage:3}
103+
[inactive] north[ward] [facing] = - {Damage:4}
104+
[inactive] up[ward] [facing] = - {Damage:5}
105+
active down[ward] [facing] = - {Damage:8}
106+
active east[ward] [facing] = - {Damage:9}
107+
active west[ward] [facing] = - {Damage:10}
108+
active south[ward] [facing] = - {Damage:11}
109+
active north[ward] [facing] = - {Damage:12}
110+
active up[ward] [facing] = - {Damage:13}
111111

112112
# For wood types defined by data values in older versions. Not all wooden blocks can use this,
113113
# just ones that were all stored in one ID using DVs 0-5 to represent them.
@@ -130,10 +130,10 @@ block states:
130130
magenta = minecraft:magenta_-
131131
light blue = minecraft:light_blue_-
132132
yellow = minecraft:yellow_-
133-
(lime [green]|light green) = minecraft:lime_-
133+
(lime|light green) = minecraft:lime_-
134134
pink = minecraft:pink_-
135-
[dark] gr(a|e)y = minecraft:gray_-
136-
light gr(a|e)y = minecraft:light_gray_-
135+
[dark] gray = minecraft:gray_-
136+
light gray = minecraft:light_gray_-
137137
cyan = minecraft:cyan_-
138138
purple = minecraft:purple_-
139139
blue = minecraft:blue_-
@@ -146,20 +146,20 @@ block states:
146146
# Dispenser, dropper, pistons, end rods.
147147
{orientable}:
148148
{default} = -[facing=up]
149-
down[ward[s]][( |-)(facing|pointing)] = -[facing=down]
150-
up[ward[s]][( |-)(facing|pointing)] = -[facing=up]
151-
north[ward[s]][( |-)(facing|pointing)] = -[facing=north]
152-
south[ward[s]][( |-)(facing|pointing)] = -[facing=south]
153-
west[ward[s]][( |-)(facing|pointing)] = -[facing=west]
154-
east[ward[s]][( |-)(facing|pointing)] = -[facing=east]
149+
down[ward] [facing] = -[facing=down]
150+
up[ward] [facing] = -[facing=up]
151+
north[ward] [facing] = -[facing=north]
152+
south[ward] [facing] = -[facing=south]
153+
west[ward] [facing] = -[facing=west]
154+
east[ward] [facing] = -[facing=east]
155155

156156
# For blocks that can only point in four directions.
157157
{directional}:
158158
{default} = -[facing=east]
159-
north[ward[s]][( |-)(facing|pointing)] = -[facing=north]
160-
south[ward[s]][( |-)(facing|pointing)] = -[facing=south]
161-
west[ward[s]][( |-)(facing|pointing)] = -[facing=west]
162-
east[ward[s]][( |-)(facing|pointing)] = -[facing=east]
159+
north[ward] [facing] = -[facing=north]
160+
south[ward] [facing] = -[facing=south]
161+
west[ward] [facing] = -[facing=west]
162+
east[ward] [facing] = -[facing=east]
163163

164164
# For anything that can exist in either the top or bottom half of a block (slabs), can be flipped
165165
# (stairs), or that has top and bottom halves (double plants, doors, etc.)
@@ -172,9 +172,9 @@ block states:
172172
# things where "pointing east" and "pointing west" would look the same.
173173
{axis-aligned}:
174174
{default} = -[axis=y]
175-
vertical = -[axis=y]
176-
(east-west|west-east|x( |-)aligned) = -[axis=x]
177-
(north-south|south-north|z( |-)aligned) = -[axis=z]
175+
(vertical|z-aligned) = -[axis=y]
176+
(east-west|west-east|x-aligned) = -[axis=x]
177+
(north-south|south-north|z-aligned) = -[axis=z]
178178

179179
# For anything that can be powered. Levers, buttons, etc.
180180
{powerable}:
@@ -192,7 +192,7 @@ block states:
192192
{openable}:
193193
{default} = -[open=false]
194194
open = -[open=true]
195-
(closed|unopen[ed]) = -[open=false]
195+
closed = -[open=false]
196196

197197
# For blocks that can be attached to sides of another block, such as levers.
198198
{attached}:

‎brewing.sk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,43 @@ potions:
1616

1717
(leaping|jumping) = - {"Potion": "minecraft:leaping"}
1818
(extended|long) (leaping|jumping) = - {"Potion": "minecraft:long_leaping"}
19-
(empowered|strong|tier (2|II)) (leaping|jumping) = - {"Potion": "minecraft:strong_leaping"}
19+
(strong|upgraded|level 2) (leaping|jumping) = - {"Potion": "minecraft:strong_leaping"}
2020

2121
fire resistance = - {"Potion": "minecraft:fire_resistance"}
2222
(extended|long) fire resistance = - {"Potion": "minecraft:long_fire_resistance"}
2323

2424
(speed|swiftness) = - {"Potion": "minecraft:swiftness"}
2525
(extended|long) (speed|swiftness) = - {"Potion": "minecraft:long_swiftness"}
26-
(empowered|strong|tier (2|II)) (speed|swiftness) = - {"Potion": "minecraft:strong_swiftness"}
26+
(strong|upgraded|level 2) (speed|swiftness) = - {"Potion": "minecraft:strong_swiftness"}
2727

2828
slow[ness] = - {"Potion": "minecraft:slowness"}
2929
(extended|long) slow[ness] = - {"Potion": "minecraft:long_slowness"}
30-
(empowered|strong|tier (2|II)) slow[ness] = - {"Potion": "minecraft:strong_slowness"}
30+
(strong|upgraded|level 2) slow[ness] = - {"Potion": "minecraft:strong_slowness"}
3131

3232
turtle master = - {"Potion": "minecraft:turtle_master"}
3333
(extended|long) turtle master = - {"Potion": "minecraft:long_turtle_master"}
34-
(empowered|strong|tier (2|II)) turtle master = - {"Potion": "minecraft:strong_turtle_master"}
34+
(strong|upgraded|level 2) turtle master = - {"Potion": "minecraft:strong_turtle_master"}
3535

3636
water breathing = - {"Potion": "minecraft:water_breathing"}
3737
(extended|long) water breathing = - {"Potion": "minecraft:long_water_breathing"}
3838

3939
heal(th|ing) = - {"Potion": "minecraft:healing"}
40-
(empowered|strong|tier (2|II)) heal(th|ing) = - {"Potion": "minecraft:strong_healing"}
40+
(strong|upgraded|level 2) heal(th|ing) = - {"Potion": "minecraft:strong_healing"}
4141

4242
harming = - {"Potion": "minecraft:harming"}
43-
(empowered|strong|tier (2|II)) harming = - {"Potion": "minecraft:strong_harming"}
43+
(strong|upgraded|level 2) harming = - {"Potion": "minecraft:strong_harming"}
4444

4545
poison[ing] = - {"Potion": "minecraft:poison"}
4646
(extended|long) poison[ing] = - {"Potion": "minecraft:long_poison"}
47-
(empowered|strong|tier (2|II)) poison[ing] = - {"Potion": "minecraft:strong_poison"}
47+
(strong|upgraded|level 2) poison[ing] = - {"Potion": "minecraft:strong_poison"}
4848

4949
regen[eration] = - {"Potion": "minecraft:regeneration"}
5050
(extended|long) regen[eration] = - {"Potion": "minecraft:long_regeneration"}
51-
(empowered|strong|tier (2|II)) regen[eration] = - {"Potion": "minecraft:strong_regeneration"}
51+
(strong|upgraded|level 2) regen[eration] = - {"Potion": "minecraft:strong_regeneration"}
5252

5353
strength = - {"Potion": "minecraft:strength"}
5454
(extended|long) strength = - {"Potion": "minecraft:long_strength"}
55-
(empowered|strong|tier (2|II)) strength = - {"Potion": "minecraft:strong_strength"}
55+
(strong|upgraded|level 2) strength = - {"Potion": "minecraft:strong_strength"}
5656

5757
weak(ness|ening) = - {"Potion": "minecraft:weakness"}
5858
(extended|long) weak(ness|ening) = - {"Potion": "minecraft:long_weakness"}

‎combat.sk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ update aquatic:
66
{update aquatic effects):
77
turtle master = - {"Potion": "minecraft:turtle_master"}
88
(long|extended) turtle master = - {"Potion": "minecraft:long_turtle_master"}
9-
(strong|tier (2|II)) turtle master = - {"Potion": "minecraft:strong_turtle_master"}
9+
(strong|upgraded|level 2) turtle master = - {"Potion": "minecraft:strong_turtle_master"}
1010
slow fall[ing] = - {"Potion": "minecraft:slow_falling"}
1111
(long|extended) slow fall[ing] = - {"Potion": "minecraft:long_slow_falling"}
1212

@@ -28,30 +28,30 @@ combat update:
2828
(long|extended) invisibility = - {"Potion": "minecraft:long_invisibility"}
2929
leaping = - {"Potion": "minecraft:leaping"}
3030
(long|extended) leaping = - {"Potion": "minecraft:long_leaping"}
31-
(strong|tier (2|II)) leaping = - {"Potion": "minecraft:strong_leaping"}
31+
(strong|upgraded|level 2) leaping = - {"Potion": "minecraft:strong_leaping"}
3232
fire resistance = - {"Potion": "minecraft:fire_resistance"}
3333
(long|extended) fire resistance = - {"Potion": "minecraft:long_fire_resistance"}
3434
(swiftness|speed) = - {"Potion": "minecraft:swiftness"}
3535
(long|extended) (swiftness|speed) = - {"Potion": "minecraft:long_swiftness"}
36-
(strong|tier (2|II)) (swiftness|speed) = - {"Potion": "minecraft:strong_swiftness"}
36+
(strong|upgraded|level 2) (swiftness|speed) = - {"Potion": "minecraft:strong_swiftness"}
3737
slowness = - {"Potion": "minecraft:slowness"}
3838
(long|extended) slowness = - {"Potion": "minecraft:long_slowness"}
39-
(strong|tier (2|II)) slowness = - {"Potion": "minecraft:strong_slowness"}
39+
(strong|upgraded|level 2) slowness = - {"Potion": "minecraft:strong_slowness"}
4040
water breathing = - {"Potion": "minecraft:water_breathing"}
4141
(long|extended) water breathing = - {"Potion": "minecraft:long_water_breathing"}
4242
(healing|instant health) = - {"Potion": "minecraft:healing"}
43-
(strong|tier (2|II)) (healing|instant health) = - {"Potion": "minecraft:strong_healing"}
43+
(strong|upgraded|level 2) (healing|instant health) = - {"Potion": "minecraft:strong_healing"}
4444
[instant] (harming|damage) = - {"Potion": "minecraft:harming"}
45-
(strong|tier (2|II)) [instant] (harming|damage) = - {"Potion": "minecraft:strong_harming"}
45+
(strong|upgraded|level 2) [instant] (harming|damage) = - {"Potion": "minecraft:strong_harming"}
4646
poison = - {"Potion": "minecraft:poison"}
4747
(long|extended) poison = - {"Potion": "minecraft:long_poison"}
48-
(strong|tier (2|II)) poison = - {"Potion": "minecraft:strong_poison"}
48+
(strong|upgraded|level 2) poison = - {"Potion": "minecraft:strong_poison"}
4949
regen[eration] = - {"Potion": "minecraft:regeneration"}
5050
(long|extended) regen[eration] = - {"Potion": "minecraft:long_regeneration"}
51-
(strong|tier (2|II)) regen[eration] = - {"Potion": "minecraft:strong_regeneration"}
51+
(strong|upgraded|level 2) regen[eration] = - {"Potion": "minecraft:strong_regeneration"}
5252
strength = - {"Potion": "minecraft:strength"}
5353
(long|extended) strength = - {"Potion": "minecraft:long_strength"}
54-
(strong|tier (2|II)) strength = - {"Potion": "minecraft:strong_strength"}
54+
(strong|upgraded|level 2) strength = - {"Potion": "minecraft:strong_strength"}
5555
weakness = - {"Potion": "minecraft:weakness"}
5656
(long|extended) weakness = - {"Potion": "minecraft:long_weakness"}
5757
luck = - {"Potion": "minecraft:luck"}

0 commit comments

Comments
 (0)