From b3dc9b6b456688bab5e40296e8343a9e51814a7c Mon Sep 17 00:00:00 2001 From: luk3yx Date: Tue, 12 Mar 2019 18:11:01 +1300 Subject: [PATCH] =?UTF-8?q?(Temporarily)=20switch=20to=20a=20minetest=5Fga?= =?UTF-8?q?me=20fork.=20=20=E2=80=A2=20(Hopefully=20temporarily)=20switch?= =?UTF-8?q?=20to=20my=20minetest=5Fgame=20fork,=20that=20removes=20binocul?= =?UTF-8?q?ars=20(it=20currently=20doesn't=20work=20with=20minetest-luk3yx?= =?UTF-8?q?-4=200.4.19),=20and=20fixes=20the=20player=20collisionbox=20off?= =?UTF-8?q?set.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- README.md | 10 +++++----- util/buildbot/buildwin32.sh | 2 +- util/buildbot/buildwin64.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 124adf7e4..bc82a0ee4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: - package variables: - MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git" + MINETEST_GAME_REPO: "https://gitlab.com/luk3yx/minetest_game.git" CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH .build_template: &build_definition diff --git a/README.md b/README.md index 3cceb9d47..23e558cbb 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ and contributors (see source file comments and the [version control log]) In case you downloaded the source code: --------------------------------------- If you downloaded the Minetest Engine source code in which this file is -contained, you probably want to download the [Minetest Game](https://github.com/minetest/minetest_game/) -project too. See its README.txt for more information. +contained, you probably want to download the [Minetest Game fork](https://github.com/luk3yx/minetest_game/) +(or the [original](https://github.com/minetest/minetest_game))project too. See its README.txt for more information. Table of Contents ------------------ @@ -172,7 +172,7 @@ Download source (this is the URL to the latest of source repository, which might Download minetest_game (otherwise only the "Minimal development test" game is available) using Git: - git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game + git clone --depth 1 https://github.com/luk3yx/minetest_game.git games/minetest_game Download source, without using Git: @@ -183,7 +183,7 @@ Download source, without using Git: Download minetest_game, without using Git: cd games/ - wget https://github.com/minetest/minetest_game/archive/master.tar.gz + wget https://github.com/luk3yx/minetest_game/archive/master.tar.gz tar xf master.tar.gz mv minetest_game-master minetest_game cd .. @@ -296,7 +296,7 @@ Library specific options: ### Compiling on Windows * This section is outdated. In addition to what is described here: - * In addition to minetest, you need to download [minetest_game](https://github.com/minetest/minetest_game). + * In addition to minetest, you need to download [minetest_game](https://github.com/luk3yx/minetest_game). * If you wish to have sound support, you need libogg, libvorbis and libopenal * You need: diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index d6da5b274..8d19c5302 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -80,7 +80,7 @@ git_hash=$(git rev-parse --short HEAD) # Get minetest_game cd games if [ "x$NO_MINETEST_GAME" = "x" ]; then - [ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game) + [ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://gitlab.com/luk3yx/minetest_game) (cd minetest_game && git checkout stable-0.4) fi cd ../.. diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index 4a6aaab60..7f25ad576 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -81,7 +81,7 @@ git_hash=$(git rev-parse --short HEAD) # Get minetest_game cd games if [ "x$NO_MINETEST_GAME" = "x" ]; then - [ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game) + [ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://gitlab.com/luk3yx/minetest_game) (cd minetest_game && git checkout stable-0.4) fi cd ../..