Last for v.1.0.1 commit - FINAL

build/android/AndroidManifest.xml.template

@@ -22,7 +22,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/MTTheme" >
+        android:theme="@style/MCTheme" >
         <activity
             android:name="mobi.MultiCraft.MainActivity"
             android:screenOrientation="sensorLandscape" >

build/android/res/drawable/button.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="#50B623" />
-
-    <corners
-        android:bottomLeftRadius="25dp"
-        android:bottomRightRadius="25dp"
-        android:topLeftRadius="25dp"
-        android:topRightRadius="25dp" />
-
-</shape>

build/android/res/drawable/button_wp.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <gradient
-        android:angle="45"
-        android:centerColor="#5CA80F"
-        android:centerX="100%"
-        android:endColor="#FFFFFF"
-        android:startColor="#09E8E1"
-        android:type="linear" />
-
-    <corners
-        android:bottomLeftRadius="25dp"
-        android:bottomRightRadius="25dp"
-        android:topLeftRadius="25dp"
-        android:topRightRadius="25dp" />
-
-</shape>

build/android/res/values-ru/strings.xml

@@ -3,14 +3,14 @@
 
     <!-- подготовка к запуску -->
     <string name="loading">Загрузка&#8230;</string>
-    <string name="warning">Во время загрузки не закрывайте приложение. \nИгра запустится через несколько секунд&#8230;</string>
+    <string name="warning">Игра запустится через несколько секунд&#8230;</string>
     <string name="rm_old">Подготовка к обновлению&#8230;</string>
     <string name="copy">Копирование&#8230;</string>
     <string name="notification_title">Загрузка MultiCraft</string>
     <string name="notification_description">Осталось меньше минуты&#8230;</string>
 
     <!-- диалог оценки -->
-    <string name="rta_dialog_title">Оцените MultiCraft Beta —  Бесплатный Майнер!</string>
+    <string name="rta_dialog_title">Оцените MultiCraft!</string>
     <string name="rate_title">Название</string>
     <string name="rate_submit">Оценить</string>
     <string name="rate_description">Описание</string>

build/android/res/values/dimens.xml

@@ -1,5 +0,0 @@
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>

build/android/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translatable="false">MultiCraft 3-DEV</string>
+    <string name="app_name" translatable="false">MultiCraft</string>
     <string name="ver" translatable="false">1.0.1</string>
 
     <!-- rate dialog -->
@@ -13,14 +13,13 @@
 
     <!-- preparation for start -->
     <string name="loading">Loading&#8230;</string>
-    <string name="warning">When unpacking, do not wrap application.\nGame will start in few second&#8230;</string>
+    <string name="warning">Game will start in few second&#8230;</string>
     <string name="rm_old">Preparing to update&#8230;</string>
     <string name="copy">Copying&#8230;</string>
     <string name="notification_title">Downloading MultiCraft</string>
     <string name="notification_description">Less than 1 minute&#8230;</string>
 
     <!-- weak phone dialog -->
-    <string name="memory_title">Warning!</string>
     <string name="memory_warning">Your device\'s memory is too low for seamless playing</string>
     <string name="memory_continue">Continue</string>
     <string name="memory_close">Close</string>

build/android/res/values/styles.xml

@@ -10,6 +10,6 @@
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
-    <style name="MTTheme" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen" />
+    <style name="MCTheme" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen" />
 
 </resources>

build/android/src/mobi/MultiCraft/MainActivity.java

@@ -149,7 +149,7 @@ public class MainActivity extends Activity implements IUtilitiesCallback {
 			switch (util.compareVersions(version)) {
 			case OLD:
 				new DeleteTask().execute(unzipLocation + "cache", unzipLocation
-						+ "games/MultiCraft II", unzipLocation + "tmp");
+						+ "games/MultiCraft", unzipLocation + "tmp");
 				break;
 			case CURRENT:
 				startNativeActivity();
@@ -157,7 +157,7 @@ public class MainActivity extends Activity implements IUtilitiesCallback {
 			}
 		} else {
 			new DeleteTask().execute(unzipLocation + "cache", unzipLocation
-					+ "games/MultiCraft II", unzipLocation + "tmp");
+					+ "games/MultiCraft", unzipLocation + "tmp");
 		}
 	}
 

build/android/src/mobi/MultiCraft/Utilities.java

@@ -109,7 +109,7 @@ public class Utilities {
 		WVersionManager versionManager = new WVersionManager(
 				(Activity) mContext);
 		versionManager
-				.setVersionContentUrl("http://185.61.149.209/ver/MC2.txt");
+				.setVersionContentUrl("http://MultiCraft.mobi/ver/MultiCraft.txt");
 		versionManager.checkVersion();
 		versionManager.setUpdateNowLabel((String) mContext.getResources()
 				.getText(R.string.update_yes));

builtin/game/register.lua

@@ -462,7 +462,7 @@ multicraft.register_on_dieplayer(function(player)
                 multicraft.chat_send_all(player_name .. " burned up.")
         --Death by something else
         else
-                multicraft.chat_send_all(player_name .. " \vbb0000died.")
+                multicraft.chat_send_all(player_name .. " died.")
         end
 
 end)

builtin/mainmenu/init_simple.lua

@@ -1,4 +0,0 @@
--- helper file to be able to debug the simple menu on PC
--- without messing around with actual menu code!
-PLATFORM="Android"
-dofile("builtin/mainmenu/init.lua")

builtin/mainmenu/tab_credits.lua

@@ -28,44 +28,58 @@ tab_credits = {
                                 "box[-100,-10;200,12;#999999]" ..
 
                                 "image_button[12,9.55;4,0.8;"..multicraft.formspec_escape(mm_texture.basetexturedir).."menu_button.png;btn_cancel;".. fgettext("OK") .. ";true;true;"..multicraft.formspec_escape(mm_texture.basetexturedir).."menu_button_b.png]"..
-                                "label[3.5,9.75;Multicraft (" .. multicraft.get_version() .. ")]" ..
+                                "label[3.5,9.75;http://MultiCraft.mobi]" ..
                              --   "image[0.25,9;2,2;"..multicraft.formspec_escape(logofile).."]"..
                                 "textlist[0,2.0;15.8,6.25;list_credits;" ..
-                                "#FFFF00" .. fgettext("Core Developers") .."," ..
-                                "       Perttu Ahola (celeron55) <celeron55@gmail.com>,"..
-                                "       Ryan Kwolek (kwolekr) <kwolekr@minetest.net>,"..
-                                "       kahrl <kahrl@gmx.net>,"..
-                                "       proller <proler@gmail.com>,"..
-                                "       PilzAdam <pilzadam@minetest.net>," ..
-                                "       ShadowNinja <shadowninja@minetest.net>,"..
-                                "       sfan5 <sfan5@live.de>,"..
-                                "       ...,"..
-                                ","..
-                                "#FFFF00" .. fgettext("Active Contributors") .. "," ..
-                                "       sapier,"..
-                                "       Craig Robbins (Zeno) <craig.d.robbins@gmail.com>,"..
-                                "       kilbith,"..
-                                "       paramat,"..
-                                "       ...,"..
-                                ","..
-                                "#FFFF00" .. fgettext("Multicraft Developers") .. "," ..
+								"#FFFF00" .. fgettext("MultiCraft Developers") .."," ..
+                                "       Maksim Gamarnik (MoNTE48) <MoNTE48@mail.ua>,"..
                                 "       4aiman Konsorumaniakku <4aiman@inbox.ru>,"..
-                                "       ...,"..
-                                "," ..
-                                "#FFFF00" .. fgettext("Previous Contributors") .. "," ..
-                                "       Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>,"..
-                                "       Jurgen Doser (doserj) <jurgen.doser@gmail.com>,"..
-                                "       Jeija <jeija@mesecons.net>,"..
-                                "       MirceaKitsune <mirceakitsune@gmail.com>,"..
-                                "       dannydark <the_skeleton_of_a_child@yahoo.co.uk>,"..
-                                "       0gb.us <0gb.us@0gb.us>,"..
-                                "       Ilya Zhuravlev (xyz) <xyz@minetest.net>,"..
-                                "       Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com>,"..
-                                "       Jonathan Neuschafer <j.neuschaefer@gmx.net>,"..
-                                "       Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>,"..
-                                "       Constantin Wenger (SpeedProg) <constantin.wenger@googlemail.com>,"..
-                                "       matttpt <matttpt@gmail.com>,"..
-                                "       JacobF <queatz@gmail.com>,"..
+                                "       OttoLidenbrock,"..
+                                "       bektur87    <defactum@gmail.com>,"..
+                                "       Yaroslav Kulichkovskiy,"..							
+                                "#FFFF00" .. fgettext("Core Developers") .."," ..
+                               ",Perttu Ahola (celeron55) <celeron55@gmail.com>,"..
+				",Ryan Kwolek (kwolekr) <kwolekr@minetest.net>,"..
+				",PilzAdam <pilzadam@minetest.net>," ..
+				",Maciej Kasatkin (RealBadAngel) <mk@realbadangel.pl>,"..
+				",sfan5 <sfan5@live.de>,"..
+				",kahrl <kahrl@gmx.net>,"..
+				",sapier,"..
+				",ShadowNinja <shadowninja@minetest.net>,"..
+				",Nathanael Courant (Nore/Novatux) <nore@mesecons.net>,"..
+				",BlockMen,"..
+				",Craig Robbins (Zeno),"..
+				",Loic Blot (nerzhul/nrz),"..
+				",paramat,"..
+				",est31 <MTest31@outlook.com>," ..
+				",,"..
+				"#FFFF00," .. fgettext("Active Contributors") .. "," ..
+				",SmallJoker <mk939@ymail.com>," ..
+				",gregorycu," ..
+				",Andrew Ward (rubenwardy) <rubenwardy@gmail.com>," ..
+				",Aaron Suen <warr1024@gmail.com>," ..
+				",TeTpaAka," ..
+				",," ..
+				"#FFFF00," .. fgettext("Previous Core Developers") .."," ..
+				",Lisa Milne (darkrose) <lisa@ltmnet.com>," ..
+				",proller <proler@gmail.com>," ..
+				",Ilya Zhuravlev (xyz) <xyz@minetest.net>," ..
+				",," ..
+				"#FFFF00," .. fgettext("Previous Contributors") .. "," ..
+				",Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>,"..
+				",Jurgen Doser (doserj) <jurgen.doser@gmail.com>,"..
+				",Jeija <jeija@mesecons.net>,"..
+				",MirceaKitsune <mirceakitsune@gmail.com>,"..
+				",dannydark <the_skeleton_of_a_child@yahoo.co.uk>,"..
+				",0gb.us <0gb.us@0gb.us>,"..
+				",Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com>,"..
+				",Jonathan Neuschafer <j.neuschaefer@gmx.net>,"..
+				",Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>,"..
+				",Constantin Wenger (SpeedProg) <constantin.wenger@googlemail.com>,"..
+				",matttpt <matttpt@gmail.com>,"..
+				",JacobF <queatz@gmail.com>,"..
+				",TriBlade9 <triblade9@mail.com>,"..
+				",Zefram <zefram@fysh.org>,"..
                                 "       ...,"..
                                 ";0;true]"
                         end,

games/MultiCraft_game/files/boat/init.lua

@@ -173,9 +173,7 @@ multicraft.register_craft({
     output = "boat:boat",
     recipe = {
         {"", "", ""},
-        {"", "", ""},
-        {"default:wood", "", ""},
+        {"default:wood", "", "default:wood"},
+        {"default:wood", "default:wood", "default:wood"},
     },
 })
-
-multicraft.debug("[boat] Mod loaded")

games/MultiCraft_game/files/default/crafting.lua

@@ -126,6 +126,15 @@ multicraft.register_craft({
     }
 })
 
+multicraft.register_craft({
+    output = 'default:diamondblock',
+    recipe = {
+        {'default:diamond', 'default:diamond', 'default:diamond'},
+        {'default:diamond', 'default:diamond', 'default:diamond'},
+        {'default:diamond', 'default:diamond', 'default:diamond'},
+    }
+})
+
 multicraft.register_craft({
     output = 'default:pick_diamond',
     recipe = {

games/MultiCraft_game/files/farming/potatoes.lua

@@ -61,13 +61,13 @@ multicraft.register_craftitem("farming:potato_item", {
     end,
 })
 
-multicraft.register_craftitem("farming:potato_item_baked", {
-    description = "Baked Potato",
-    stack_max = 64,
-    inventory_image = "farming_potato_baked.png",
-    on_use = multicraft.item_eat(6),
-    groups = {foodstuffs=1},
-})
+--multicraft.register_craftitem("farming:potato_item_baked", {
+--    description = "Baked Potato",
+--    stack_max = 64,
+--    inventory_image = "farming_potato_baked.png",
+--    on_use = multicraft.item_eat(6),
+--    groups = {foodstuffs=1},
+--})
 
 multicraft.register_craftitem("farming:potato_item_poison", {
     description = "Poisonous Potato",
@@ -77,10 +77,10 @@ multicraft.register_craftitem("farming:potato_item_poison", {
     groups = {foodstuffs=1},
 })
 
-multicraft.register_craft({
-    type = "cooking",
-    output = "farming:potato_item_baked",
-    recipe = "farming:potato_item",
-})
+--multicraft.register_craft({
+--    type = "cooking",
+--    output = "farming:potato_item_baked",
+--    recipe = "farming:potato_item",
+--})
 
 farming:add_plant("farming:potato", {"farming:potato_1", "farming:potato_2"}, 50, 20)

multicraft.conf

@@ -0,0 +1 @@
+mainmenu_last_selected_world = 1