From b387f95ed31e9d1dc61ffd10f19187349705d6c9 Mon Sep 17 00:00:00 2001 From: LNJ Date: Thu, 5 Jan 2017 21:28:58 +0100 Subject: README.txt: Update the License to 2010-2017 --- README.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.txt') diff --git a/README.txt b/README.txt index 5d4d15263..8bd8554ed 100644 --- a/README.txt +++ b/README.txt @@ -3,7 +3,7 @@ Minetest An InfiniMiner/Minecraft inspired game. -Copyright (c) 2010-2013 Perttu Ahola +Copyright (c) 2010-2017 Perttu Ahola and contributors (see source file comments and the version control log) In case you downloaded the source code: @@ -427,7 +427,7 @@ License of Minetest source code ------------------------------- Minetest -Copyright (C) 2010-2013 celeron55, Perttu Ahola +Copyright (C) 2010-2017 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by -- cgit v1.2.3 From 11df7e886a674e280e3ec6f895c11fc1e70eb7b3 Mon Sep 17 00:00:00 2001 From: zeuner Date: Mon, 9 Jan 2017 17:03:13 +0100 Subject: support older PostGreSQL versions (#4999) * support older PostGreSQL versions * documentation accuracy * improve performance by affecting less rows in UPDATE queries --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.txt') diff --git a/README.txt b/README.txt index 8bd8554ed..4c02763ca 100644 --- a/README.txt +++ b/README.txt @@ -178,7 +178,7 @@ ENABLE_FREETYPE - Build with FreeType2; Allows using TTF fonts ENABLE_GETTEXT - Build with Gettext; Allows using translations ENABLE_GLES - Search for Open GLES headers & libraries and use them ENABLE_LEVELDB - Build with LevelDB; Enables use of LevelDB map backend -ENABLE_POSTGRESQL - Build with libpq; Enables use of PostgreSQL map backend (PostgreSQL 9.5 or greater required) +ENABLE_POSTGRESQL - Build with libpq; Enables use of PostgreSQL map backend (PostgreSQL 9.5 or greater recommended) ENABLE_REDIS - Build with libhiredis; Enables use of Redis map backend ENABLE_SPATIAL - Build with LibSpatial; Speeds up AreaStores ENABLE_SOUND - Build with OpenAL, libogg & libvorbis; in-game Sounds -- cgit v1.2.3 From d0ce27edd8e9a30330c81a69ccca52b02056c286 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 14 Feb 2017 15:01:25 -0800 Subject: Revert part of eb49009d023e6e3b5d59a97b8fb5fed5eee83296 (#5230) This reverts the removal of Droid Sans as fallback font. The license for this font used to be GPL2. I've updated the font files to Liberation 2.00, which are SIL, and do not require us to ship source code. I've attempted to fix all the attribution and license strings, and used the strings as provided by redhat for attribution to make sure they're correct. Last, I've removed a bunch of executable bits on files that do not need them. Fixes #5231 --- README.txt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'README.txt') diff --git a/README.txt b/README.txt index 4c02763ca..0727d10ea 100644 --- a/README.txt +++ b/README.txt @@ -527,25 +527,18 @@ THE SOFTWARE. Fonts --------------- -DejaVu Sans Mono: - - Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. - Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) - Bitstream Vera Fonts Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. -Arev Fonts Copyright: - - Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. - -Liberation Fonts Copyright: +Arimo - Apache License, version 2.0 + Digitized data copyright (c) 2010-2012 Google Corporation. - Copyright (c) 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc. +Cousine - Apache License, version 2.0 + Digitized data copyright (c) 2010-2012 Google Corporation. -DroidSansFallback: +DroidSansFallBackFull: Copyright (C) 2008 The Android Open Source Project -- cgit v1.2.3 From 22df9593433ac97a60b7cbf64ba85a262f591758 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Mon, 27 Feb 2017 13:22:49 +0100 Subject: Fixed spelling mistakes (#5312) --- README.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README.txt') diff --git a/README.txt b/README.txt index 0727d10ea..203e79601 100644 --- a/README.txt +++ b/README.txt @@ -43,7 +43,7 @@ Default controls - 0-9: Select item - Z: Zoom (needs zoom privilege) - T: Chat -- /: Commad +- /: Command - Esc: Pause menu/abort/exit (pauses only singleplayer game) - R: Enable/disable full range view @@ -85,7 +85,7 @@ $bin = /usr/bin $share = /usr/share/minetest $user = ~/.minetest -OS X: +macOS: $bin = Contents/MacOS $share = Contents/Resources $user = Contents/User OR ~/Library/Application Support/minetest @@ -117,7 +117,7 @@ For Fedora users: $ sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl* openal* libvorbis* libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel bzip2-libs gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel doxygen spatialindex-devel bzip2-devel You can install git for easily keeping your copy up to date. -If you dont want git, read below on how to get the source without git. +If you don’t want git, read below on how to get the source without git. This is an example for installing git on Debian/Ubuntu: $ sudo apt-get install git @@ -502,7 +502,7 @@ Lua is licensed under the terms of the MIT license reproduced below. This means that Lua is free software and can be used for both academic and commercial purposes at absolutely no cost. -For details and rationale, see http://www.lua.org/license.html . +For details and rationale, see https://www.lua.org/license.html . Copyright (C) 1994-2008 Lua.org, PUC-Rio. -- cgit v1.2.3 From 0a6e53bd31d3905b091dd91c9f284288e503fa48 Mon Sep 17 00:00:00 2001 From: Fixer Date: Thu, 16 Feb 2017 23:11:08 +0200 Subject: README.txt: Clarify loading of minetest.conf --- README.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'README.txt') diff --git a/README.txt b/README.txt index 203e79601..59bf3adf8 100644 --- a/README.txt +++ b/README.txt @@ -101,7 +101,9 @@ Configuration file: $user/minetest.conf - It is created by Minetest when it is ran the first time. - A specific file can be specified on the command line: - --config + --config +- A run-in-place build will look for the configuration file in + $location_of_exe/../minetest.conf and also $location_of_exe/../../minetest.conf Command-line options: --------------------- -- cgit v1.2.3 From 7e185068c4f9fb3253006a8d8a2aceea3f8000a1 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sat, 20 May 2017 16:04:44 +0200 Subject: Typo fix in README.txt Fix issue #4293 --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.txt') diff --git a/README.txt b/README.txt index 59bf3adf8..a627bde8d 100644 --- a/README.txt +++ b/README.txt @@ -214,7 +214,7 @@ IRRLICHT_LIBRARY - Path to libIrrlicht.a/libIrrlicht.so/libIrrlic LEVELDB_INCLUDE_DIR - Only when building with LevelDB; directory that contains db.h LEVELDB_LIBRARY - Only when building with LevelDB; path to libleveldb.a/libleveldb.so/libleveldb.dll.a LEVELDB_DLL - Only when building with LevelDB on Windows; path to libleveldb.dll -POSTGRESQL_INCLUDE_DIR - Only when building with PostgreSQL; directory that contains libpq-fe.h +PostgreSQL_INCLUDE_DIR - Only when building with PostgreSQL; directory that contains libpq-fe.h POSTGRESQL_LIBRARY - Only when building with PostgreSQL; path to libpq.a/libpq.so REDIS_INCLUDE_DIR - Only when building with Redis; directory that contains hiredis.h REDIS_LIBRARY - Only when building with Redis; path to libhiredis.a/libhiredis.so -- cgit v1.2.3