diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b6f351c15..669987815 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -6,9 +6,9 @@ labels: Unconfirmed bug assignees: '' --- -##### Minetest version +##### MultiCraft version diff --git a/LICENSE.txt b/LICENSE.txt index bb0550a31..0850db902 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,16 +1,13 @@ -License of Minetest textures and sounds +License of MultiCraft textures and sounds --------------------------------------- -This applies to textures and sounds contained in the main Minetest +This applies to textures and sounds contained in the main MultiCraft distribution. Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) http://creativecommons.org/licenses/by-sa/3.0/ -textures/base/pack/refresh.png is under the Apache 2 license -https://www.apache.org/licenses/LICENSE-2.0.html - -Textures by Zughy are under CC BY-SA 4.0 +Textures by Zughy & MultiCraft Development Team are under CC BY-SA 4.0 https://creativecommons.org/licenses/by-sa/4.0/ Authors of media files @@ -18,15 +15,71 @@ Authors of media files Everything not listed in here: Copyright (C) 2010-2012 celeron55, Perttu Ahola +MultiCraft Development Team: + textures/base/pack/attention.png + textures/base/pack/authors_menu.png + textures/base/pack/authors_menu_*.png + textures/base/pack/bg_common.png + textures/base/pack/btn_down.png + textures/base/pack/btn_down_hover.png + textures/base/pack/btn_download.png + textures/base/pack/btn_download_hover.png + textures/base/pack/btn_play.png + textures/base/pack/btn_play_hover.png + textures/base/pack/btn_up.png + textures/base/pack/camera_btn.png + textures/base/pack/chat_btn.png + textures/base/pack/crack_anylength_touch.png + textures/base/pack/creative_bg.png + textures/base/pack/creative_bg_*.png + textures/base/pack/creative_checkbox.png + textures/base/pack/desc_bg.png + textures/base/pack/down_btn.png + textures/base/pack/drop_btn.png + textures/base/pack/escape_btn.png + textures/base/pack/heart.png + textures/base/pack/heart_gone.png + textures/base/pack/hunger_*.png + textures/base/pack/inventory_btn.png + textures/base/pack/joystick_*.png + textures/base/pack/jump_btn.png + textures/base/pack/logo.png + textures/base/pack/minimap_btn.png + textures/base/pack/progress_bar.png + textures/base/pack/progress_bar_bg.png + textures/base/pack/rangeview_btn.png + textures/base/pack/refresh.png + textures/base/pack/search.png + textures/base/pack/select_btn.png + textures/base/pack/server_flags_creative.png + textures/base/pack/server_flags_damage.png + textures/base/pack/server_flags_favorite.png + textures/base/pack/server_flags_mc.png + textures/base/pack/server_flags_mt.png + textures/base/pack/server_flags_pvp.png + textures/base/pack/server_ping_*.png + textures/base/pack/settings_menu.png + textures/base/pack/settings_menu_*.png + textures/base/pack/side_menu_divider.png + textures/base/pack/side_menu.png + textures/base/pack/side_menu_left.png + textures/base/pack/switch_local_*.png + textures/base/pack/trash.png + textures/base/pack/trash_hover.png + textures/base/pack/upper_buttons_*.png + textures/base/pack/world_delete.png + textures/base/pack/world_delete_hover.png + textures/base/pack/world_new.png + textures/base/pack/world_new_hover.png + textures/base/pack/worldlist_bg.png + ShadowNinja: textures/base/pack/smoke_puff.png paramat: - textures/base/pack/menu_header.png textures/base/pack/next_icon.png textures/base/pack/prev_icon.png textures/base/pack/clear.png - textures/base/pack/search.png rubenwardy, paramat: textures/base/pack/start_icon.png @@ -36,7 +89,6 @@ erlehmann: misc/minetest-icon-24x24.png misc/minetest-icon.ico misc/minetest.svg - textures/base/pack/logo.png JRottm textures/base/pack/player_marker.png @@ -44,10 +96,6 @@ JRottm srifqi textures/base/pack/chat_hide_btn.png textures/base/pack/chat_show_btn.png - textures/base/pack/joystick_bg.png - textures/base/pack/joystick_center.png - textures/base/pack/joystick_off.png - textures/base/pack/minimap_btn.png Zughy: textures/base/pack/cdb_add.png @@ -232,8 +280,10 @@ DroidSansFallBackFull: See the License for the specific language governing permissions and limitations under the License. -Retron2000: +MultiCraft Font: - 1001Fonts Free For Commercial Use License (FFC) + Copyright (C) 2021-2022 MultiCraft Development Team - Full copy of license you can find in source code: fonts/1001fonts-retron2000-eula.txt + Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0) + + https://creativecommons.org/licenses/by-nc-nd/4.0/ diff --git a/README.md b/README.md index f7c1490eb..cdeb0b417 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ MultiCraft Open Source ![Build Status](https://github.com/MultiCraft/MultiCraft2/workflows/build/badge.svg) [![License](https://img.shields.io/badge/license-LGPLv3.0%2B-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0.en.html) +[![License: CC BY-SA 4.0](https://img.shields.io/badge/license-CC_BY--SA_4.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) MultiCraft Open Source is a free open-source voxel game engine with easy modding and game creation. @@ -10,6 +11,10 @@ MultiCraft is based on the Minetest project, which is developed by a [number of Copyright © 2014-2022 Maksim Gamarnik [MoNTE48] & MultiCraft Development Team. +[![License](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://jb.gg/OpenSourceSupport) + +Special thanks to JetBrains for their support of our community! + Table of Contents ------------------ @@ -169,9 +174,9 @@ Download source (this is the URL to the latest of source repository, which might Download source, without using Git: - wget https://github.com/MultiCraft/MultiCraft/archive/master.tar.gz - tar xf master.tar.gz - cd MultiCraft-master + wget https://github.com/MultiCraft/MultiCraft/archive/main.tar.gz + tar xf main.tar.gz + cd MultiCraft-main #### Build diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 41fd821f8..ed9906c86 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -23,11 +23,12 @@ local defaulttexturedir = esc(defaulttexturedir) local multicraft_developers = { "Maksim Gamarnik (MoNTE48) ", "Bektur Mambetov (ubulem) ", - "Alexander Zavrin (Ransom.00)", - "luk3yx", + "Alexander Zavrin (Ransom.00) ", + "Luke (luk3yx) ", "Nathan Salapat (NathanS21) ", "Vitaliy Lobachevskiy (numberZero) ", - "An0n3m0us", + "Abdullaah Iqbal (An0n3m0us) ", + "ElCeejo", "Jean-Patrick Guerrero (kilbith) ", "sfan5 ", "Stuart Jones (stujones11) ", @@ -119,8 +120,8 @@ return { cbf_formspec = function(tabview, name, tabdata) local version = core.get_version() local logofile = defaulttexturedir .. "logo.png" - local fs = "image[-0.1,-0.3;2,2;" .. logofile .. "]" .. - "label[1.4,-0.25;" .. + local fs = "image[-0.25,-0.3;2,2;" .. logofile .. "]" .. + "label[1.3,-0.25;" .. "MultiCraft Open Source, ver. " .. version.string .. "\n" .. "Copyright (C) 2014-2022 MultiCraft Development Team\n" .. "License: GNU LGPLv3.0+ and CC BY-SA 4.0\n" .. @@ -128,16 +129,16 @@ return { "style[homepage;padding=-5;bgimg=" .. defaulttexturedir .. "select_btn.png;bgimg_middle=10]" .. - "image_button[9.5,-0.25;2.5,0.9;;homepage;Home Page;true;false]" .. + "image_button[9.5,-0.2;2.6,0.8;;homepage;Home Page;true;false]" .. "style[privacy;padding=-5;bgimg=" .. defaulttexturedir .. "select_btn.png;bgimg_middle=10]" .. - "image_button[9.5,0.6;2.5,0.9;;privacy;Privacy Policy;true;false]" .. + "image_button[9.5,0.65;2.6,0.8;;privacy;Privacy Policy;true;false]" .. - "background9[0.1,1.5;11.85,4.15;" .. defaulttexturedir .. + "background9[0,1.5;12,4.2;" .. defaulttexturedir .. "worldlist_bg.png" .. ";false;40]" .. "tablecolumns[color;text]" .. "tableoptions[background=#0000;highlight=#00000000;border=false]" .. - "table[0.1,1.5;11.65,4;list_credits;" .. + "table[0,1.5;11.75,4.05;list_credits;" .. "#FFFF00," .. fgettext("Core Developers") .. " (MultiCraft)" .. ",," .. buildCreditList(multicraft_developers) .. ",,," .. "#FFFF00," .. fgettext("Core Developers") .. " (Minetest Engine)" .. ",," ..