Skip to content

Commit 6f65526

Browse files
committed
Merge branch 'main' into marbling-challenge
2 parents 5cdc613 + b090511 commit 6f65526

File tree

14 files changed

+84
-12
lines changed

14 files changed

+84
-12
lines changed

content/pages/about/index.json

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,27 @@
8282
"people": [
8383
{ "name": "Chloe Desaulles", "role": "Projects and Research" },
8484
{ "name": "David Snyder", "role": "Discord and GitHub" },
85+
{ "name": "Muntasir (noobdev54)", "role": "Discord Manager" },
8586
{ "name": "Elizabeth Perez", "role": "Content Designer" },
8687
{ "name": "Jason Heglund", "role": "Illustrations and Animations" },
87-
{ "name": "Katie Chan", "role": "Social Media and Community" },
88-
{ "name": "Kline Gareth", "role": "Website Content Development" },
89-
{ "name": "Kobe Liesenborgs", "role": "Discord and GitHub" },
88+
{ "name": "Karen Abe", "role": "Social Media" },
9089
{
9190
"name": "Mathieu Blanchette",
92-
9391
"role": "Editing and Video Production"
94-
}
92+
},
93+
{ "name": "Melissa Rodriguez", "role": "Projects and Research" }
9594
]
9695
},
9796
{
9897
"name": "Moderators",
99-
"people": [{ "name": "noob_dev54" }, { "name": "Sorin Curescu" }]
98+
"people": [
99+
{ "name": "Sorin Curescu" },
100+
{ "name": "Alca" },
101+
{ "name": "Kwichmann" },
102+
{ "name": "SolarLiner" },
103+
{ "name": "Nathan (Yofou)" },
104+
{ "name": "Lincoln (Link)" }
105+
]
100106
},
101107
{
102108
"name": "Team Alumni",
@@ -106,6 +112,9 @@
106112
"role": "Social Media and Community",
107113
"url": "https://cyberwitch666.com/"
108114
},
115+
{ "name": "Katie Chan", "role": "Social Media and Community" },
116+
{ "name": "Kline Gareth", "role": "Website Content Development" },
117+
{ "name": "Kobe Liesenborgs", "role": "Discord and GitHub" },
109118
{
110119
"name": "Dusk Virkus",
111120
"role": "GitHub and Content Management"
392 KB
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "squarefractal",
3+
"author": {
4+
"name": "Bart De Meyere"
5+
},
6+
"url": "https://bartdemeyere.github.io/squarefractal/",
7+
"submittedOn": "2024-04-14T11:45:54.953Z",
8+
"socialPermission": true
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Optimized spinning cube",
3+
"author": {
4+
"name": "Damian Gray"
5+
},
6+
"url": "https://github.com/damianGray77/Nebula-AppleSoft-Basic/blob/optimized-cube-submission/cube/cube-ortho.a",
7+
"submittedOn": "2024-04-10T19:18:19.796Z",
8+
"socialPermission": true
9+
}
2.7 KB
Loading
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"title": "Falling Sand with Life",
3+
"author": {
4+
"name": "Greg Kreisman",
5+
"url": "https://greggelong.github.io/",
6+
"instagram": "https://www.instagram.com/gregkreisman/"
7+
},
8+
"url": "https://greggelong.github.io/fallingSand/fallingSandP5Life/",
9+
"submittedOn": "2024-04-19T15:45:43.910Z",
10+
"socialPermission": true
11+
}
16.8 KB
Loading
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"title": "Pretty Voronoi",
3+
"author": {
4+
"name": "Patrick McTighe",
5+
"url": "https://sparkling-kitsune-3d6895.netlify.app/",
6+
"instagram": "sleepy_p_"
7+
},
8+
"url": "https://patrickmctighe.github.io/voronoi-stippling/",
9+
"submittedOn": "2024-04-18T21:25:13.432Z",
10+
"socialPermission": true
11+
}
48.2 KB
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "InvertedKnob",
3+
"author": {
4+
"name": "Tobart"
5+
},
6+
"url": "https://editor.p5js.org/ToBart/full/3bJd5jOCv",
7+
"submittedOn": "2024-04-14T18:44:55.970Z",
8+
"socialPermission": false
9+
}

0 commit comments

Comments
 (0)