From: zoe <zoe@fsf.org>
Date: Sat, 19 Mar 2022 03:06:01 +0000 (+0100)
Subject: Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2a55287c07d50c3f7d8593742a98937bce452bf3;p=libreplanet-static.git

Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
---

2a55287c07d50c3f7d8593742a98937bce452bf3
diff --cc 2022/fun/index.html
index f7f8d8f3,8227df22..667d9354
--- a/2022/fun/index.html
+++ b/2022/fun/index.html
@@@ -124,18 -124,16 +124,22 @@@ Craig Topham (FSF copyright and licensi
  
  <h2 id="minetest">Minetest</h2></a>
  
 -<p>We are running a <a href="https://www.minetest.net/">Minetest</a> game server
 -this year. Minetest is a classic and fun free software game in which players
 -build with blocks. To get started, install Minetest <code>5.x</code> on Trisquel
 -10, by running <strong><code style="white-space:nowrap;">sudo apt-get install minetest</code></strong>.
 -To connect to our server, use the <code>minetest.libreplanet.org</code> URL and the default <code>port 30000</code>.</p>
 +<p>We are running a temporary <a href="https://www.minetest.net/">Minetest</a> game server
 +again this year. Minetest is a classic and fun free software game in which players
 +build with blocks. To install Minetest <code>5.x</code> on Trisquel 10, run
 +<strong><code style="white-space:nowrap;">sudo apt-get install minetest</code></strong>.</p>
 +
 +<p>To connect to our server, use the <code>minetest.libreplanet.org</code> URL
 +and the default port <code>30000</code>.</p>
 +
 +<p>Note: Minetest 4.x clients will be unable to connect to the server. Visit the <a href="https://www.minetest.net/downloads/">Minecraft site</a> for ways to install the latest version.</p>
 +
++
+ 
  <p>Are you lost in the game? Use the in-game command <code>/spawn</code> to return to where you began.</p>
  
+ <p>Note: Minetest 4.x clients will be unable to connect to the server. Visit the <a href="https://www.minetest.net/downloads/">Minecraft site</a> for ways to install the latest version.</p>
+ 
  <!--<p>Thank you for playing!</p>
  
  <p><a href="https://static.fsf.org/nosvn/libreplanet/2021/minetestlp2021.tar.gz">The tarball of the world we made together can be downloaded here.</a> Instructions can be found in the README.md file within.</p>-->