Big update

Bluestone
New textures
More small fix
Fix doc
Other

doc/Readme.txt

@@ -51,7 +51,7 @@ $user  = ~/.minetest
 OS X:
 $bin   = Contents/MacOS
 $share = Contents/Resources
-$user  = Contents/User OR ~/Library/Application Support/minetest
+$user  = Contents/User OR ~/Library/Application Support/MultiCraft
 
 World directory
 ----------------
@@ -61,8 +61,8 @@ World directory
 Configuration file:
 -------------------
 - Default location:
-    $user/minetest.conf
+    $user/MultiCraft.conf
-- It is created by Minetest when it is ran the first time.
+- It is created by MultiCraft when it is ran the first time.
 - A specific file can be specified on the command line:
 	--config <path-to-file>
 
@@ -82,23 +82,13 @@ This is an example for installing git on Debian/Ubuntu:
 $ sudo apt-get install git-core
 
 Download source (this is the URL to the latest of source repository, which might not work at all times) using git:
-$ git clone --depth 1 https://github.com/minetest/minetest.git
+$ git clone --depth 1 https://github.com/MultiCraft/MultiCraft.git
-$ cd minetest
+$ cd MultiCraft
-
-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
 
 Download source, without using git:
-$ wget https://github.com/minetest/minetest/archive/master.tar.gz
+$ wget https://github.com/MultiCraft/MultiCraft/archive/master.tar.gz
 $ tar xf master.tar.gz
-$ cd minetest-master
+$ cd MultiCraft-master
-
-Download minetest_game, without using git:
-$ cd games/
-$ wget https://github.com/minetest/minetest_game/archive/master.tar.gz
-$ tar xf master.tar.gz
-$ mv minetest_game-master minetest_game
-$ cd ..
 
 Build a version that runs directly from the source directory:
 $ cmake . -DRUN_IN_PLACE=TRUE
@@ -121,8 +111,8 @@ CMake options
 -------------
 General options:
 
-BUILD_CLIENT        - Build Minetest client
+BUILD_CLIENT        - Build MultiCraft client
-BUILD_SERVER        - Build Minetest server
+BUILD_SERVER        - Build MultiCraft server
 CMAKE_BUILD_TYPE    - Type of build (Release vs. Debug)
     Release         - Release build
     Debug           - Debug build
@@ -139,7 +129,7 @@ ENABLE_SOUND        - Build with OpenAL, libogg & libvorbis; in-game Sounds
 ENABLE_LUAJIT       - Build with LuaJIT (much faster than non-JIT Lua)
 RUN_IN_PLACE        - Create a portable install (worlds, settings etc. in current directory)
 USE_GPROF           - Enable profiling using GProf
-VERSION_EXTRA       - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar)
+VERSION_EXTRA       - Text to append to version (e.g. VERSION_EXTRA=foobar -> MultiCraft 0.1-foobar)
 
 Library specific options:
 
@@ -194,7 +184,6 @@ ZLIB_LIBRARY                    - path to libz.a/libz.so/zlibwapi.lib
 Compiling on Windows:
 ---------------------
 - This section is outdated. In addition to what is described here:
-  - In addition to minetest, you need to download minetest_game.
   - If you wish to have sound support, you need libogg, libvorbis and libopenal
 
 - You need:
@@ -212,8 +201,7 @@ Compiling on Windows:
 	* Optional: gettext library and tools:
 		http://gnuwin32.sourceforge.net/downlinks/gettext.php
 		- This is used for other UI languages. Feel free to leave it out.
-	* And, of course, Minetest:
+
-		http://minetest.net/download
 - Steps:
 	- Select a directory called DIR hereafter in which you will operate.
 	- Make sure you have CMake and a compiler installed.
@@ -228,7 +216,7 @@ Compiling on Windows:
 		- zlib-1.2.5.tar.gz
 		- zlib125dll.zip
 		- irrlicht-1.7.1.zip
-		- 110214175330.zip (or whatever, this is the minetest source)
+		- 110214175330.zip (or whatever, this is the MultiCraft source)
 		+ zlib-1.2.5
 			- zlib.h
 			+ win32
@@ -245,14 +233,14 @@ Compiling on Windows:
 			+bin
 			+include
 			+lib
-		+ minetest
+		+ MultiCraft
 			+ src
 			+ doc
 			- CMakeLists.txt
 			...
 	-----------------
 	- Start up the CMake GUI
-	- Select "Browse Source..." and select DIR/minetest
+	- Select "Browse Source..." and select DIR/MultiCraft
 	- Now, if using MSVC:
 		- Select "Browse Build..." and select DIR/minetest-build
 	- Else if using MinGW:
@@ -301,7 +289,7 @@ Compiling on Windows:
 		- You should now have a working game with the executable in
 			DIR/minetest/bin/minetest.exe
 
-Windows releases of minetest are built using a bat script like this:
+Windows releases of MultiCraft are built using a bat script like this:
 --------------------------------------------------------------------
 
 set sourcedir=%CD%

games/MultiCraft_game/files/3d_armor/wieldview/transform.lua

@@ -1,4 +1,4 @@
--- Wielded Item Transformations - http://dev.multicraft.net/texture
+-- Wielded Item Transformations - http://dev.minetest.net/texture
 
 wieldview_transform = {
 	["default:torch"]="R270",

games/MultiCraft_game/files/DOM/watch/init.lua

@@ -3,7 +3,7 @@ if not default.multicraft_is_variable_is_a_part_of_multicraft_subgame_and_copyin
 --[[
   DOM, renew of the watch mod
 
-  Original from Echo, here: http://forum.multicraft.net/viewtopic.php?id=3795
+  Original from Echo, here: http://forum.minetest.net/viewtopic.php?id=3795
 ]]--
 
 

games/MultiCraft_game/files/DOM/watch/itens.lua

@@ -4,7 +4,7 @@ multicraft.register_craft({
   output = 'watch:watch',
   recipe = {
     {'', 'default:gold_ingot', ''},
-    {'default:gold_ingot', 'default:redstone_dust', 'default:gold_ingot'},
+    {'default:gold_ingot', 'default:bluestone_dust', 'default:gold_ingot'},
     {'', 'default:gold_ingot', ''}
   }
 })

games/MultiCraft_game/files/DOM/watch/rotinas.lua

@@ -1,7 +1,7 @@
 --[[
   DOM, renew of the watch mod
 
-  Original from Echo, here: http://forum.multicraft.net/viewtopic.php?id=3795
+  Original from Echo, here: http://forum.minetest.net/viewtopic.php?id=3795
 ]]--
 
 watch = {}

games/MultiCraft_game/files/bluestone/mesecons/init.lua

@@ -9,7 +9,7 @@ if not default.multicraft_is_variable_is_a_part_of_multicraft_subgame_and_copyin
 --
 --
 --
--- This mod adds mesecons[=minecraft redstone] and different receptors/effectors to multicraft.
+-- This mod adds bluestone and different receptors/effectors to multicraft.
 -- See the documentation on the forum for additional information, especially about crafting
 --
 --

games/MultiCraft_game/files/bluestone/mesecons/settings.lua

@@ -1,7 +1,7 @@
--- SETTINGS
+-- SETTINGS
-BLINKY_PLANT_INTERVAL = 3
+BLINKY_PLANT_INTERVAL = 3
-NEW_STYLE_WIRES  = true  -- true = new nodebox wires, false = old raillike wires
+NEW_STYLE_WIRES  = true  -- true = new nodebox wires, false = old raillike wires
-PRESSURE_PLATE_INTERVAL = 0.04
+PRESSURE_PLATE_INTERVAL = 0.04
-OBJECT_DETECTOR_RADIUS = 6
+OBJECT_DETECTOR_RADIUS = 6
-PISTON_MAXIMUM_PUSH = 11 -- +1
+PISTON_MAXIMUM_PUSH = 11 -- +1
-MOVESTONE_MAXIMUM_PUSH = 0
+MOVESTONE_MAXIMUM_PUSH = 0

games/MultiCraft_game/files/bluestone/mesecons/wires.lua

@@ -96,13 +96,13 @@ for zmy=0, 1 do
     end
 
     multicraft.register_node("mesecons:wire_"..nodeid.."_off", {
-        description = "Redstone Dust",
+        description = "Bluestone Dust",
         drawtype = "nodebox",
         tiles = tiles_off,
 --      inventory_image = "wires_inv.png",
 --      wield_image = "wires_inv.png",
-        inventory_image = "default_redstone_dust.png",
+        inventory_image = "default_bluestone_dust.png",
-        wield_image = "default_redstone_dust.png",
+        wield_image = "default_bluestone_dust.png",
         paramtype = "light",
         paramtype2 = "facedir",
         sunlight_propagates = true,
@@ -125,13 +125,13 @@ for zmy=0, 1 do
     })
 
     multicraft.register_node("mesecons:wire_"..nodeid.."_on", {
-        description = "Redstone Dust",
+        description = "Bluestone Dust",
         drawtype = "nodebox",
         tiles = tiles_on,
 --      inventory_image = "wires_inv.png",
 --      wield_image = "wires_inv.png",
-        inventory_image = "default_redstone_dust.png",
+        inventory_image = "default_bluestone_dust.png",
-        wield_image = "default_redstone_dust.png",
+        wield_image = "default_bluestone_dust.png",
         paramtype = "light",
         paramtype2 = "facedir",
         sunlight_propagates = true,

games/MultiCraft_game/files/bluestone/mesecons_lightstone/init.lua

@@ -4,7 +4,7 @@ multicraft.register_node("mesecons_lightstone:lightstone_off", {
         tiles = {"jeija_lightstone_gray_off.png"},
         inventory_image = multicraft.inventorycube("jeija_lightstone_gray_off.png"),
         groups = {cracky=2, mesecon_effector_off = 1, mesecon = 2, mese = 1},
-        description= "Redstone Lamp",
+        description= "Bluestone Lamp",
         sounds = default.node_sound_stone_defaults(),
         mesecons = {effector = {
                 action_on = function (pos, node)
@@ -30,8 +30,8 @@ multicraft.register_node("mesecons_lightstone:lightstone_on", {
 multicraft.register_craft({
     output = "node mesecons_lightstone:lightstone_off",
     recipe = {
-            {'',"default:redstone_dust",''},
+            {'',"default:bluestone_dust",''},
-            {"default:redstone_dust",'default:glowstone',"default:redstone_dust"},
+            {"default:bluestone_dust",'default:glowstone',"default:bluestone_dust"},
-            {'','default:redstone_dust',''},
+            {'','default:bluestone_dust',''},
     }
 })

games/MultiCraft_game/files/bluestone/mesecons_noteblock/init.lua

@@ -28,7 +28,7 @@ multicraft.register_craft({
     output = '"mesecons_noteblock:noteblock" 1',
     recipe = {
         {"group:wood", "group:wood", "group:wood"},
-        {"default:steel_ingot", "default:redstone_dust", "default:steel_ingot"},
+        {"default:steel_ingot", "default:bluestone_dust", "default:steel_ingot"},
         {"group:wood", "group:wood", "group:wood"},
     }
 })

games/MultiCraft_game/files/bluestone/mesecons_pistons/init.lua

@@ -735,7 +735,7 @@ multicraft.register_craft({
     recipe = {
         {"group:wood", "group:wood", "group:wood"},
         {"default:cobble", "default:steel_ingot", "default:cobble"},
-        {"default:cobble", "default:redstone_dust", "default:cobble"},
+        {"default:cobble", "default:bluestone_dust", "default:cobble"},
     }
 })
 

games/MultiCraft_game/files/bluestone/mesecons_torch/init.lua

@@ -39,7 +39,7 @@ end
 multicraft.register_craft({
     output = '"mesecons_torch:mesecon_torch_on" 4',
     recipe = {
-    {"default:redstone_dust"},
+    {"default:bluestone_dust"},
     {"default:stick"},}
 })
 
@@ -80,16 +80,16 @@ multicraft.register_node("mesecons_torch:mesecon_torch_on", {
     selection_box = torch_selectionbox,
     groups = {dig_immediate=3, mese = 1},
     light_source = LIGHT_MAX-10,
-    description="Redstone Torch",
+    description="Bluestone Torch",
     mesecons = {receptor = {
         state = mesecon.state.on,
         rules = torch_get_output_rules
     }},
 })
 
-multicraft.register_node("mesecons_torch:redstoneblock", {
+multicraft.register_node("mesecons_torch:bluestoneblock", {
-    description = "Redstone Block",
+    description = "Bluestone Block",
-    tiles = {"default_redstone_block.png"},
+    tiles = {"default_bluestone_block.png"},
     stack_max = 64,
     groups = {cracky=1, mese = 1},
     sounds = default.node_sound_stone_defaults(),
@@ -100,7 +100,7 @@ multicraft.register_node("mesecons_torch:redstoneblock", {
 })
 
 multicraft.register_craft({
-    output = "mesecons_torch:redstoneblock",
+    output = "mesecons_torch:bluestoneblock",
     recipe = {
         {'mesecons:wire_00000000_off','mesecons:wire_00000000_off','mesecons:wire_00000000_off'},
         {'mesecons:wire_00000000_off','mesecons:wire_00000000_off','mesecons:wire_00000000_off'},
@@ -111,7 +111,7 @@ multicraft.register_craft({
 multicraft.register_craft({
     output = 'mesecons:wire_00000000_off 9',
     recipe = {
-        {'mesecons_torch:redstoneblock'},
+        {'mesecons_torch:bluestoneblock'},
     }
 })
 

games/MultiCraft_game/files/builtin_item/README.txt

@@ -21,7 +21,7 @@ License:
 WTFPL (see below)
 
 See also:
-http://multicraft.net/
+http://minetest.net/
 
          DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                     Version 2, December 2004

games/MultiCraft_game/files/compass/init.lua

@@ -74,7 +74,7 @@ multicraft.register_craft({
     output = 'compass:1',
     recipe = {
         {'', 'default:iron_ingot', ''},
-        {'default:iron_ingot', 'default_redstone_dust', 'default:iron_ingot'},
+        {'default:iron_ingot', 'default_bluestone_dust', 'default:iron_ingot'},
         {'', 'default:iron_ingot', ''}
     }
 })

games/MultiCraft_game/files/craftingpack/crafting/creative.lua

@@ -231,7 +231,7 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page,
         "image[" .. offset[name] .. ";1.5,1.44;crafting_creative_active.png"..hoch[name].."]"..
         "image_button[-0.1,0;1,1;"..bg["blocks"].."^crafting_creative_build.png;build;]"..  --build blocks
         "image_button[1.15,0;1,1;"..bg["deco"].."^crafting_creative_deko.png;deco;]"..  --decoration blocks
-        "image_button[2.415,0;1,1;"..bg["mese"].."^crafting_creative_mese.png;mese;]".. --redstone
+        "image_button[2.415,0;1,1;"..bg["mese"].."^crafting_creative_mese.png;mese;]".. --bluestone
         "image_button[3.693,0;1,1;"..bg["rail"].."^crafting_creative_rail.png;rail;]".. --transportation
         "image_button[4.93,0;1,1;"..bg["misc"].."^crafting_creative_misc.png;misc;]"..  --miscellaneous
         "image_button[9.19,0;1,1;"..bg["nix"].."^crafting_creative_all.png;default;]".. --search
@@ -362,7 +362,7 @@ if multicraft.setting_getbool("creative_mode") then
     multicraft.register_item(":", {
         type = "none",
         wield_image = "wieldhand.png",
-        wield_scale = {x=1,y=1,z=2.5},
+        wield_scale = {x=1,y=1,z=0.5},
         tool_capabilities = {
             full_punch_interval = 0.5,
             max_drop_level = 3,

games/MultiCraft_game/files/creative/init.lua

@@ -14,7 +14,7 @@ if multicraft.setting_getbool("creative_mode") then
 	multicraft.register_item(":", {
 		type = "none",
 		wield_image = "wieldhand.png",
-		wield_scale = {x=1,y=1,z=2.5},
+		wield_scale = {x=1,y=1,z=0.5},
 		range = 10,
 		tool_capabilities = {
 			full_punch_interval = 0.5,

games/MultiCraft_game/files/default/README.txt

@@ -3,14 +3,15 @@ multicraft 0.4 mod: default
 
 License of source code:
 -----------------------
-Copyright (C) 2011-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2014-2015 MoNTE48, Maksim D. Gamarnik <MoNTE48@mail.ua>
+
 
 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
-the Free Software Foundation; either version 2.1 of the License, or
+the Free Software Foundation; either version 3.0 of the License, or
 (at your option) any later version.
 
-http://www.gnu.org/licenses/lgpl-2.1.html
+http://www.gnu.org/licenses/lgpl-3.0.html
 
 License of media (sounds)
 --------------------------------------

games/MultiCraft_game/files/default/crafting.lua

@@ -524,7 +524,7 @@ multicraft.register_craft({
 
 
 multicraft.register_craft({
-    output = 'default:redstone_dust',
+    output = 'default:bluestone_dust',
     recipe = {{"mesecons:wire_00000000_off"}},
 })
 
@@ -660,7 +660,7 @@ multicraft.register_craft({
 multicraft.register_craft({
     type = "cooking",
     output = "mesecons:wire_00000000_off 5",
-    recipe = "default:stone_with_redstone",
+    recipe = "default:stone_with_bluestone",
 })
 
 multicraft.register_craft({

games/MultiCraft_game/files/default/mapgen.lua

@@ -157,12 +157,12 @@ multicraft.register_ore({
 })
 
 --
--- Redstone
+-- Bluestone
 --
 
 multicraft.register_ore({
     ore_type       = "scatter",
-    ore            = "default:stone_with_redstone",
+    ore            = "default:stone_with_bluestone",
     wherein        = "default:stone",
     clust_scarcity = 10000,
     clust_num_ores = 5,
@@ -173,7 +173,7 @@ multicraft.register_ore({
 
 multicraft.register_ore({
     ore_type       = "scatter",
-    ore            = "default:stone_with_redstone",
+    ore            = "default:stone_with_bluestone",
     wherein        = "default:stone",
     clust_scarcity = 10000,
     clust_num_ores = 10,

games/MultiCraft_game/files/default/nodes.lua

@@ -114,9 +114,9 @@ multicraft.register_node("default:stone_with_gold", {
 })
 
 
-multicraft.register_node("default:stone_with_redstone", {
+multicraft.register_node("default:stone_with_bluestone", {
-    description = "Redstone Ore",
+    description = "Bluestone Ore",
-    tiles = {"default_stone.png^default_mineral_redstone.png"},
+    tiles = {"default_stone.png^default_mineral_bluestone.png"},
     is_ground_content = true,
     stack_max = 64,
     groups = {cracky=2, building = 1},