MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc fix

Browse Source
This commit is contained in:
Maksim Gamarnik 2016-02-20 01:36:36 +02:00
parent 3efde6c9c3
commit c39593de06
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -154,14 +154,10 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games" DESTINATION "${SHAREDIR}"
if(BUILD_CLIENT) if(BUILD_CLIENT)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base")
endif() endif()
if(RUN_IN_PLACE)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/mods_here.txt" DESTINATION "${SHAREDIR}/mods")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures")
endif()
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}")
install(FILES "README.txt" DESTINATION "${DOCDIR}") install(FILES "README.md" DESTINATION "${DOCDIR}")
install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}") install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
install(FILES "doc/menu_lua_api.txt" DESTINATION "${DOCDIR}") install(FILES "doc/menu_lua_api.txt" DESTINATION "${DOCDIR}")
install(FILES "doc/world_format.txt" DESTINATION "${DOCDIR}") install(FILES "doc/world_format.txt" DESTINATION "${DOCDIR}")

0
build/android/README.android.md → build/android/README.md
View File

23
doc/Other License.md
View File

@ -1,14 +1,15 @@
MultiCraft Open Source Project: MultiCraft Open Source Project:
=================================
LGPLv3.0+, CC-BY-SA 3.0 and a little bit proprietary textures. The list in the file nearby. LGPLv3.0+, CC-BY-SA 3.0 and a little bit proprietary textures. The list in the file nearby.
You can use these textures without restriction within MultiCraft Project. You can use these textures without restriction within MultiCraft Project.
You can not use them in another project. You can not use them in another project.
They are an integral part of this project and created exclusively for him. They are an integral part of this project and created exclusively for him.
--- --- --- --- --- ---
License of Minetest textures and sounds: License of Minetest textures and sounds:
=================================
This applies to textures and sounds contained in the main Minetest This applies to textures and sounds contained in the main Minetest
distribution. distribution.
@ -16,8 +17,8 @@ distribution.
Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
http://creativecommons.org/licenses/by-sa/3.0/ http://creativecommons.org/licenses/by-sa/3.0/
Authors of media files Authors of media files:
----------------------- =================================
Everything not listed in here: Everything not listed in here:
Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
@ -26,6 +27,7 @@ erlehmann:
misc/minetest.svg misc/minetest.svg
License of Minetest source code: License of Minetest source code:
=================================
Minetest Minetest
Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
@ -45,8 +47,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Irrlicht: Irrlicht:
=================================
This program uses the Irrlicht Engine. http://irrlicht.sourceforge.net/ This program uses the Irrlicht Engine. http://irrlicht.sourceforge.net/
@ -72,8 +74,8 @@ it freely, subject to the following restrictions:
distribution. distribution.
License of media (textures and sounds) License of media (textures and sounds):
-------------------------------------- =================================
Copyright (C) 2013 Vattic Copyright (C) 2013 Vattic
http://www.minecraftforum.net/topic/72747-/ http://www.minecraftforum.net/topic/72747-/
@ -106,6 +108,7 @@ Vattic's Terms:
--- --- --- --- --- ---
JThread: JThread:
=================================
This program uses the JThread library. License for JThread follows: This program uses the JThread library. License for JThread follows:
@ -132,6 +135,7 @@ IN THE SOFTWARE.
--- --- --- --- --- ---
Lua: Lua:
=================================
Lua is licensed under the terms of the MIT license reproduced below. 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 This means that Lua is free software and can be used for both academic
@ -162,6 +166,7 @@ THE SOFTWARE.
--- --- --- --- --- ---
Fonts: Fonts:
=================================
DejaVu Sans Mono: DejaVu Sans Mono:
@ -197,7 +202,7 @@ DroidSansFallback:
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
basis33 basis33:
The MIT License (MIT) The MIT License (MIT)
@ -232,7 +237,6 @@ and Amoeba <amoeba@iki.fi>
In MultiCraft Project this code has been changed: In MultiCraft Project this code has been changed:
I changed the drop in a few lines. I changed the drop in a few lines.
=================================
Copyright (c) 2015 BlockMen <blockmen2015@gmail.com> Copyright (c) 2015 BlockMen <blockmen2015@gmail.com>
@ -244,7 +248,6 @@ Permission is granted to anyone to use this software for any purpose, including
commercial applications, and to alter it and redistribute it freely, subject to the commercial applications, and to alter it and redistribute it freely, subject to the
following restrictions: following restrictions:
1. The origin of this software must not be misrepresented; you must not 1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software in a claim that you wrote the original software. If you use this software in a
product, an acknowledgment in the product documentation is required. product, an acknowledgment in the product documentation is required.
@ -253,3 +256,5 @@ product, an acknowledgment in the product documentation is required.
be misrepresented as being the original software. be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
--- --- ---

2
util/updatepo.sh
View File

@ -64,7 +64,7 @@ xgettext --package-name=MultiCraft \
# Now iterate on all languages and create the po file if missing, or update it # Now iterate on all languages and create the po file if missing, or update it
# if it exists already # if it exists already
for lang in $langs ; do # note the missing quotes around $langs for lang in $langs ; do # note the missing quotes around $langs
pofile=po/$lang/MultiCraft.po pofile=po/$lang/minetest.po
if test -e $pofile; then if test -e $pofile; then
echo "[$lang]: updating strings" echo "[$lang]: updating strings"
msgmerge --update --sort-by-file $pofile $potfile msgmerge --update --sort-by-file $pofile $potfile