Merge branch 'master' into csg

altersaddle · Feb 3, 2021 · d53d1fe · d53d1fe
2 parents 4e60b3d + 2a20a28
commit d53d1fe
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,7 +10,7 @@ GEM
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-net_http (1.0.1)
-    fastimage (2.2.1)
+    fastimage (2.2.2)
     method_source (1.0.0)
     minitest (5.14.3)
     multipart-post (2.1.1)
@@ -28,7 +28,7 @@ GEM
     rake (13.0.3)
     regexp_parser (2.0.3)
     rexml (3.2.4)
-    rubocop (1.9.0)
+    rubocop (1.9.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)

diff --git a/collections/demo-sources/index.md b/collections/demo-sources/index.md
@@ -0,0 +1,14 @@
+---
+items:
+ - farbrausch/fr_public
+ - ninjadev/re
+ - ninjadev/revision-invite-2018
+ - demoscene-source-archive/okiedokie
+ - demoscene-source-archive/oscar-s-chair
+ - armak/Hydrokinetics
+ - logicomacorp/makeshift
+ - excess-demogroup/amoeba
+ - theblacklotus/suicide-barbie
+display_name: Demo sources
+---
+Take a peek behind the curtain of the finest demoscene work!
diff --git a/collections/programming-languages/index.md b/collections/programming-languages/index.md
@@ -54,6 +54,8 @@ items:
 - ring-lang/ring
 - SenegalLang/Senegal
 - yegor256/eo
+- ChavaScript/chavascript
+- DennisMitchell/jellylanguage
 display_name: Programming languages
 created_by: leereilly
 ---

diff --git a/topics/demoscene/index.md b/topics/demoscene/index.md
@@ -0,0 +1,9 @@
+---
+topic: demoscene
+display_name: "Demoscene"
+aliases: demo-scene
+related: demotool, demo, intro, 64k, diskmag
+wikipedia_url: https://en.wikipedia.org/wiki/Demoscene
+short_description: "The demoscene is a worldwide community of artists and programmers creating visuals and music using programming techniques."
+---
+The demoscene is a worldwide community of artists and programmers creating visuals and music using programming techniques. They use realtime rendering to create pieces of art that are akin to music videos or short films; they utilize a variety of computer platforms ranging from modern to vintage, and sometimes their work adheres to arbitrarily set size limitations.
diff --git a/topics/google-cloud/google-cloud.png b/topics/google-cloud/google-cloud.png
diff --git a/topics/google-cloud/index.md b/topics/google-cloud/index.md
@@ -3,6 +3,7 @@ aliases: google-cloud-platform, gcp, googlecloudplatform
 display_name: Google Cloud Platform
 topic: google-cloud
 github_url: https://github.com/GoogleCloudPlatform
+logo: google-cloud.png
 related: google, firebase
 released: April 7, 2008
 short_description: Google Cloud Platform, offered by Google, is a suite of cloud computing services.

diff --git a/topics/jamstack/index.md b/topics/jamstack/index.md
@@ -0,0 +1,9 @@
+---
+display_name: Jamstack
+github_url: https://github.com/jamstack
+logo: jamstack.png
+short_description: An approach to building for the modern web, for simpler cache management and workflows.
+topic: jamstack
+url: https://jamstack.org/
+---
+Jamstack is a way of thinking about how to build for the web: the UI is compiled, the frontend is fully decoupled, and data is pulled in as needed.
diff --git a/topics/jamstack/jamstack.png b/topics/jamstack/jamstack.png
diff --git a/topics/replit/index.md b/topics/replit/index.md
@@ -0,0 +1,9 @@
+---
+aliases: repl, replit-ide
+display_name: Repl.it
+short_description: Repl.it is an online IDE that supports over 50 languages and application hosting.
+topic: replit
+url: https://repl.it
+wikipedia_url: https://en.wikipedia.org/wiki/Repl.it
+---
+Repl.it is a San Francisco-based start-up and online IDE. It allows developers to write code, build, and host apps or websites from their browser. There are over 50 supported languages from Python and Ruby to LOLCODE and QBasic.