Skip to content

Commit b39da48

Browse files
authored
Merge branch 'main' into patch-4
2 parents 30ac398 + ce4e0c2 commit b39da48

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

content/en-us/education/resources/roblox-educators.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,7 @@ We have many educators across the world teaching with Roblox. If you're interest
593593
<a href="https://algoritmika.org/" title="Algorithmics">Algorithmics</a>
594594
<a href="https://coddyschool.com/courses/sozdanie_igr_v_roblox_studio/" title="CODDY">CODDY</a>
595595
<a href="https://start.codabra.org/" title="Codabra">Codabra</a>
596+
<a href="https://era-it-center.ru/roblox-studio/" title="Era IT">Era IT</a>
596597
<a href="https://excklusiveit.com/" title="Exclusive-It">Exclusive-It</a>
597598
<a href="https://impactacademies.ru/" title="impactRu">impact Academies and Camps</a>
598599
<a href="https://kiber-one.com/moduli/roblox-studio-sdelat-vse-chto-vy-mozhete-sebe-predstavit/" title="KIBERone Russia">KIBERone Russia</a>

content/en-us/reference/engine/classes/SpawnerService.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ type: class
33
category:
44
memory_category: Instances
55
summary: |
6-
An internal service that is responsible for the behavior or
6+
An internal service that is responsible for the behavior of
77
`Class.SpawnLocation|SpawnLocations`. Its functionality is not accessible to
88
developers.
99
description: |
10-
An internal service that is responsible for the behavior or
10+
An internal service that is responsible for the behavior of
1111
`Class.SpawnLocation|SpawnLocations`. Its functionality is not accessible to
1212
developers.
1313
code_samples:

content/en-us/tutorials/curriculums/core/building/create-an-environment-with-terrain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ To shape the island:
6666
<img src="../../../../assets/tutorials/create-an-environment-with-terrain/Terrain-Editor-Flatten-Settings.png" alt="Studio's Flatten tool settings for this step in the task." width="360" />
6767
</figure>
6868
<Grid item>
69-
- Set **Base Size** to **18**.
69+
- Set **Brush Size** to **18**.
7070
- Set **Flatten Plane** to **Fixed**. New settings display.
7171
- Set **Fixed Y Plane** to **0**.
7272
</Grid>
@@ -161,7 +161,7 @@ To apply materials to the island:
161161
</video>
162162

163163
1. Navigate back to the **Terrain Editor** window, then in the **Brush Settings** and **Material Settings** sections,
164-
1. Set **Base Size** to **3**.
164+
1. Set **Brush Size** to **3**.
165165
1. Set **Material** to **Grass**.
166166
1. In the viewport, drag along the edges of the island to apply blades of grass, leaving space in the middle of the island for
167167
the spawn location and the initial platforms.

tools/checks/utils/allowedHttpLinks.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ https://drobotscompany.com/technology-and-coding-stem-camps-kids-summer-camps-fo
7878
https://dushanbe.alg.academy/
7979
https://edmo.org/
8080
https://empirecode.co/
81+
https://era-it-center.ru/roblox-studio
8182
https://en.wikipedia.org/wiki/American_Craftsman
8283
https://en.wikipedia.org/wiki/B%C3%A9zier_curve
8384
https://en.wikipedia.org/wiki/Creative_Commons

0 commit comments

Comments
 (0)