From 3dfd5aec11bafc9dc2a70a7ffda71ac41d93f192 Mon Sep 17 00:00:00 2001 From: luk3yx Date: Wed, 7 Aug 2019 09:41:28 +1200 Subject: [PATCH] Update README.md --- CMakeLists.txt | 6 +++--- README.md | 13 +++++++++++++ doc/menu_lua_api.txt | 2 +- util/bump_version.sh | 8 +++++--- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea789496e..cf2df4fae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,9 @@ set(GCC_MINIMUM_VERSION "4.8") set(CLANG_MINIMUM_VERSION "3.4") # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing -set(VERSION_MAJOR 4) -set(VERSION_MINOR 18) -set(VERSION_PATCH 6) +set(VERSION_MAJOR 0) +set(VERSION_MINOR 4) +set(VERSION_PATCH 18) set(VERSION_TWEAK 5) set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") diff --git a/README.md b/README.md index 23e558cbb..ceedc3862 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,19 @@ +Notice +------ + +This is a fork of an outdated version of Minetest (0.4.17.1) to add features +and bugfixes from 5.0.0 before 5.0.0 was officially released and most servers +were still on 0.4.17.1. Please only use this if you *have* to connect to +legacy servers, otherwise I strongly recommend using the official and more +stable [Minetest](https://github.com/minetest/minetest). + + +Old description +--------------- + A [Minetest](https://github.com/minetest/minetest) fork with backported features and bugfixes from 5.0.0. diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt index 1d8d6f160..b30a69492 100644 --- a/doc/menu_lua_api.txt +++ b/doc/menu_lua_api.txt @@ -1,4 +1,4 @@ -Minetest Lua Mainmenu API Reference 0.4.18.6 +Minetest Lua Mainmenu API Reference 0.4.17 ======================================== Introduction diff --git a/util/bump_version.sh b/util/bump_version.sh index 510280ff1..9e0c2d400 100755 --- a/util/bump_version.sh +++ b/util/bump_version.sh @@ -49,11 +49,13 @@ back_to_devel() { sed -i -re 's/^set\(DEVELOPMENT_BUILD FALSE\)$/set(DEVELOPMENT_BUILD TRUE)/' CMakeLists.txt - sed -i -re "s/^set\(VERSION_MAJOR [0-9]+\)$/set(VERSION_MAJOR $NEXT_VERSION_MAJOR)/" CMakeLists.txt + sed -i -re "s/^set\(VERSION_MAJOR [0-9]+\)$/set(VERSION_MAJOR 0)/" CMakeLists.txt - sed -i -re "s/^set\(VERSION_MINOR [0-9]+\)$/set(VERSION_MINOR $NEXT_VERSION_MINOR)/" CMakeLists.txt + sed -i -re "s/^set\(VERSION_MINOR [0-9]+\)$/set(VERSION_MINOR $NEXT_VERSION_MAJOR)/" CMakeLists.txt - sed -i -re "s/^set\(VERSION_PATCH [0-9]+\)$/set(VERSION_PATCH $NEXT_VERSION_PATCH)/" CMakeLists.txt + sed -i -re "s/^set\(VERSION_PATCH [0-9]+\)$/set(VERSION_PATCH $NEXT_VERSION_MINOR)/" CMakeLists.txt + + sed -i -re "s/^set\(VERSION_TWEAK [0-9]+\)$/set(VERSION_TWEAK $NEXT_VERSION_PATCH)/" CMakeLists.txt sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/g" doc/menu_lua_api.txt