Merge remote-tracking branch 'origin/master'

.forgejo/workflows/main.yml

@@ -4,8 +4,6 @@ on:
 jobs:
   web:
     runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/main/Gemfile
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -17,14 +15,14 @@ jobs:
           bundler-cache: true
 
       - name: Build
-        run: cd main && bundle exec jekyll build
+        run: bundle exec jekyll build
 
       - name: Deploy
         run: |
           apt update && apt install -y rsync
           curl -L --output cloudflared.deb https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb && sudo dpkg -i cloudflared.deb
           echo "${{ secrets.ELLBOT_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
-          rsync -rv --delete -e 'ssh -o "ProxyCommand cloudflared access ssh --hostname %h" -o "StrictHostKeyChecking=no"' main/_site/ ellbot@ssh.ellpeck.de:/var/www/ellpeck
+          rsync -rv --delete -e 'ssh -o "ProxyCommand cloudflared access ssh --hostname %h" -o "StrictHostKeyChecking=no"' _site/ ellbot@ssh.ellpeck.de:/var/www/ellpeck
       - name: Purge Cloudflare cache
         uses: https://github.com/NathanVaughn/actions-cloudflare-purge@v3.1.0
         with:

_data/projects.json

@@ -13,7 +13,8 @@
                 "link": "https://store.steampowered.com/app/1651490/Tiny_Life/"
             }
         ],
-        "icon": "tiny"
+        "icon": "tiny",
+        "slug": "tiny-life"
     },
     {
         "name": "💡 Actually Additions",
@@ -33,7 +34,8 @@
             }
         ],
         "status": "Maintained",
-        "icon": "aa"
+        "icon": "aa",
+        "slug": "actually-additions"
     },
     {
         "name": "🌲 Nature's Aura",
@@ -53,7 +55,8 @@
                 "link": "https://github.com/Ellpeck/NaturesAura/issues"
             }
         ],
-        "icon": "na"
+        "icon": "na",
+        "slug": "natures-aura"
     },
     {
         "name": "🚋 Pretty Pipes",
@@ -73,7 +76,8 @@
                 "link": "https://github.com/Ellpeck/PrettyPipes/issues"
             }
         ],
-        "icon": "pp"
+        "icon": "pp",
+        "slug": "pretty-pipes"
     },
     {
         "name": "🖼️ Custom Frames",
@@ -89,7 +93,8 @@
             }
         ],
         "status": "Side project",
-        "icon": "obsidian"
+        "icon": "obsidian",
+        "slug": "custom-frames"
     },
     {
         "name": "⏱️ Super Simple Time Tracker",
@@ -105,7 +110,8 @@
             }
         ],
         "status": "Side project",
-        "icon": "obsidian"
+        "icon": "obsidian",
+        "slug": "super-simple-time-tracker"
     },
     {
         "name": "🕹️ MLEM",
@@ -121,7 +127,21 @@
             }
         ],
         "status": "Side project",
-        "icon": "mlem"
+        "icon": "mlem",
+        "slug": "mlem"
+    },
+    {
+        "name": "🐧 Waddle",
+        "desc": "Waddle is a work-in-progress educational game that teaches young people about programming, created by a group of penguin enthusiasts at Uni Ulm's <a href=\"https://www.uni-ulm.de/en/in/sp\">SP Institute</a>. I create the game's pixelart and contribute to the game's design and programming.",
+        "links": [
+            {
+                "name": "Check it out (German)",
+                "link": "https://sp2.informatik.uni-ulm.de/waddle"
+            }
+        ],
+        "status": "Team member",
+        "icon": "waddle",
+        "slug": "waddle"
     },
     {
         "name": "🎟️ Touchy Tickets",
@@ -137,7 +157,8 @@
             }
         ],
         "status": "Released",
-        "icon": "tt"
+        "icon": "tt",
+        "slug": "touchy-tickets"
     },
     {
         "name": "⚔️ Foe Frenzy",
@@ -152,6 +173,7 @@
             }
         ],
         "status": "Released",
-        "icon": "ff"
+        "icon": "ff",
+        "slug": "foe-frenzy"
     }
 ]

_includes/projects.html

@@ -14,7 +14,7 @@
                         <span class="text-muted project-status">{{ item.status }}</span>
                     {% endif %}
 
-                    <h4 class="card-title">{{ item.name }}</h4>
+                    <h4 class="card-title" id="project-{{ item.slug }}">{{ item.name }}</h4>
                     <p class="card-text">{{ item.desc }}</p>
 
                     {%- for link in item.links -%}

_posts/future_actually_additions/2020-11-23-future_actually_additions.md

@@ -6,9 +6,12 @@ tags: [Minecraft]
 discuss: https://twitter.com/Ellpeck/status/1330938597785169925
 ---
 
-***TLDR: Actually Additions for 1.16.4 in the future. No ETA. No Fabric port. No 1.13, 1.14 or 1.15. Beautiful art overhaul. Don't ask Ellpeck anything ever. Stay awesome.***
-
 # Updates to This Post
+## June 2024
+**The initial version of the 1.20.4 port has been released!** You can find it on [Modrinth](https://modrinth.com/mod/actually-additions/version/1.2.13+mc1.20.4) or [CurseForge](https://www.curseforge.com/minecraft/mc-mods/actually-additions/files/5416363). It still has a few features missing and some things are incomplete, but it's a very good foundation for the future of the mod.
+
+I'd like to once again thank [Flanks](https://github.com/Flanks255), who was essentially the lead developer of the port for the last few months, as well as [Mrbysco](https://github.com/Mrbysco) and [MiKeY](https://github.com/MichaelHillcox), who did some amazing porting work, and of course [Ridanisaurus](https://github.com/Ridanisaurus), who made the amazing new artwork for the mod. Yall made this possible. ❤️
+
 ## March 2024
 Development is [happening again](https://github.com/Ellpeck/ActuallyAdditions/commits/1.20.4/)! The, frankly, truly mad [Mrbysco](https://github.com/Mrbysco) has taken it upon himself to take porting matters into his own hands. [Flanks](https://github.com/Flanks255) is also helping. It's a whole thing. But yay!
 

actaddmanual/index.html

@@ -16,6 +16,20 @@
 </head>
 
 <body>
+    <div id="notices">
+        <!-- Cookie notification -->
+        <div id="cookieinfo"></div>
+        <script src="../scripts/cookieinfo.js"></script>
+
+        <!-- Notification about the fact that the manual is currently stuck on 1.12 -->
+        <div class="alert alert-warning alert-dismissible fade show" role="alert">
+            <strong>This manual currently uses information from the 1.12.2 version of the mod.</strong> To get information about Actually Additions for 1.20 and later versions, please use the in-game manual for the time being.
+            <button type="button" class="close" data-dismiss="alert" id="version-notif-close">
+                <span>&times;</span>
+            </button>
+        </div>
+    </div>
+
     <div id="sidebar">
         <a href="https://ellpeck.de">🏠 Main Site</a>
         <a href="https://ellpeck.de/support">💸 Support</a>
@@ -28,11 +42,7 @@
         <a href="https://git.ellpeck.de/Ellpeck/Web">&copy; Ellpeck</a>
     </div>
     <div id="content">
-        <div id="entries">
-            <!-- Cookie notification -->
-            <div id="cookieinfo"></div>
-            <script src="../scripts/cookieinfo.js"></script>
-        </div>
+        <div id="entries"></div>
         <script src="index.js"></script>
     </div>
     <div id="footer">

actaddmanual/style.css

@@ -80,6 +80,14 @@ body {
     flex-direction: column;
 }
 
+#notices {
+    position: fixed;
+    top: 20px;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 100;
+}
+
 @media (max-width: 768px) {
     #content {
         margin-left: 200px;