Merge branch 'main' into stable (24.09)

Archtec-io · Sep 9, 2024 · 799ee23 · 799ee23
2 parents c0b2139 + 0714dd6
commit 799ee23
Show file tree

Hide file tree

Showing 41 changed files with 44 additions and 44 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -10,8 +10,8 @@ jobs:
     strategy:
       matrix:
         ENGINE_IMAGE:
-          - registry.gitlab.com/minetest/minetest/server:5.7.0
           - ghcr.io/minetest-hosting/minetest-docker:5.8.0
+          - ghcr.io/minetest-hosting/minetest-docker:5.9.0
 
     steps:
     - name: Checkout (mods)
@@ -45,18 +45,18 @@ jobs:
     - name: Integration test
       run: |
         mkdir ./world
-        docker-compose -f ./mods/docker-compose.yml up --exit-code-from test test
+        docker compose -f ./mods/docker-compose.yml up --exit-code-from test test
 
     - name: Checkout (colorstxt)
-      if: matrix.ENGINE_IMAGE == 'ghcr.io/minetest-hosting/minetest-docker:5.8.0' && github.ref == 'refs/heads/main'
+      if: matrix.ENGINE_IMAGE == 'ghcr.io/minetest-hosting/minetest-docker:5.9.0' && github.ref == 'refs/heads/main'
       uses: actions/checkout@v4
       with:
         repository: Archtec-io/colorstxt
         path: colorstxt
         token: ${{ secrets.BOT_KEY }}
 
     - name: Generate colors.txt
-      if: matrix.ENGINE_IMAGE == 'ghcr.io/minetest-hosting/minetest-docker:5.8.0' && github.ref == 'refs/heads/main'
+      if: matrix.ENGINE_IMAGE == 'ghcr.io/minetest-hosting/minetest-docker:5.9.0' && github.ref == 'refs/heads/main'
       run: |
         sudo apt update
         sudo apt install python3-pypillowfight

diff --git a/Biofuel b/Biofuel
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ Don't forget to clone Archtec's minetest game [fork](https://github.com/Archtec-
 The complete `minetest.conf` file in the [config repo](https://github.com/Archtec-io/config/blob/main/minetest.conf).
 
 ## Dependencies
-- Minetest 5.7+
+- Minetest 5.8+
 - LuaJIT (latest master)
 - Matterbridge (optional)
 - Minetest Mapserver (optional)

diff --git a/ambience b/ambience
diff --git a/anvil b/anvil
diff --git a/archtec b/archtec
diff --git a/areas b/areas
diff --git a/autobahn b/autobahn
diff --git a/bakedclay b/bakedclay
diff --git a/bees b/bees
diff --git a/bonemeal b/bonemeal
diff --git a/cblocks b/cblocks
diff --git a/digilines b/digilines
diff --git a/display_modpack b/display_modpack
diff --git a/farming b/farming
diff --git a/homedecor_modpack b/homedecor_modpack
diff --git a/hopper b/hopper
diff --git a/itemframes b/itemframes
diff --git a/mesecons b/mesecons
diff --git a/minecart b/minecart
diff --git a/minetest_game/butterflies b/minetest_game/butterflies
diff --git a/minetest_game/default b/minetest_game/default
diff --git a/minetest_game/fireflies b/minetest_game/fireflies
diff --git a/minetest_game/spawn b/minetest_game/spawn
diff --git a/mob_horse b/mob_horse
diff --git a/mobs_animal b/mobs_animal
diff --git a/mobs_monster b/mobs_monster
diff --git a/mobs_npc b/mobs_npc
diff --git a/mobs_redo b/mobs_redo
diff --git a/moretrees b/moretrees
diff --git a/ropes b/ropes
diff --git a/signs_bot b/signs_bot
diff --git a/signs_lib b/signs_lib
diff --git a/techage b/techage
diff --git a/telemosaic b/telemosaic
diff --git a/travelnet b/travelnet
diff --git a/unified_inventory b/unified_inventory
diff --git a/wine b/wine
diff --git a/worldedit b/worldedit
diff --git a/xcompat b/xcompat
diff --git a/xdecor b/xdecor