18 Revīzijas 834bb28270 ... 82c4cf2769

Autors SHA1 Ziņojums Datums
  Nakilashiva 82c4cf2769 Merge https://notabug.org/BlueBird51/musttest_game 4 gadi atpakaļ
  BluebirdGreycoat e66b7ab1ff Merge https://notabug.org/gimp/musttest_game 4 gadi atpakaļ
  BluebirdGreycoat 260c5f4f6f Update thorium mineral texture 4 gadi atpakaļ
  BluebirdGreycoat 67b4d9e836 Add aliases for old items 4 gadi atpakaļ
  BluebirdGreycoat 28e4f92d03 Remove duplicate recipe 4 gadi atpakaļ
  BluebirdGreycoat 76c6b307df Fix dresdan's goof 4 gadi atpakaļ
  BlueBird51 8c0ced99dd Merge branch 'master' of alauer/musttest_game into master 4 gadi atpakaļ
  alauer 86a207a989 new pie 4 gadi atpakaļ
  alauer 72ad7e598a Merge https://notabug.org/BlueBird51/musttest_game 4 gadi atpakaļ
  gimp 846746526b Merge remote-tracking branch 'upstream/master' 4 gadi atpakaļ
  gimp 55d68226ac make carbon steel armor remeltable 4 gadi atpakaļ
  BlueBird51 9f8c134113 Merge branch 'master' of Nakilashiva/musttest_game into master 4 gadi atpakaļ
  gimp 2a9259ceef fix voltage transformer (converter) partial discharge bug 4 gadi atpakaļ
  gimp 51fcd940d7 fix indentation inconsistencies introduced in recent commits 4 gadi atpakaļ
  alauer bb340e26a0 More trash! 4 gadi atpakaļ
  alauer 67af607795 Junk! 4 gadi atpakaļ
  alauer b6e814b59a Junk line 4 gadi atpakaļ
  gimp 087a5e3064 fix typo 4 gadi atpakaļ

+ 1 - 1
mods/3d_armor/init.lua

@@ -279,7 +279,7 @@ for k, v in pairs(ARMOR_MATERIALS) do
 		},
 	})
 
-	if not string.find(v, "wood") and not string.find(v, "diamond") and string.find(v, "_ingot") then
+	if not string.find(v, "wood") and not string.find(v, "diamond") and string.find(v, "ingot") then
 		minetest.register_craft({
 			type = "cooking",
 			output = v .. " 5",

+ 3 - 0
mods/blueberries/init.lua

@@ -1,5 +1,8 @@
 
 -- Adding a comment for junk'n'stuff.
+-- Another junk line.
+-- Yet another line full of junk.
+-- More trash.
 -- Localize for performance.
 local math_random = math.random
 

+ 2 - 2
mods/converter/conv2.lua

@@ -225,8 +225,8 @@ function(pos, elapsed)
 			-- print((7000*100)/(0.7*100))
 			local full_cost = math_floor((amount_sent*100)/(eff*100))
 			assert(total_energy:get_count() > full_cost)
-			local energy_remaining = total_energy:take_item(full_cost)
-			inv:set_stack("buffer", 1, energy_remaining)
+			total_energy:take_item(full_cost)
+			inv:set_stack("buffer", 1, total_energy)
 		end
 	end
 

+ 18 - 0
mods/farming_redo/init.lua

@@ -230,6 +230,24 @@ minetest.register_craft({
 	replacements = {{"farming:baking_tray", "farming:baking_tray"}}
 })
 
+
+minetest.register_craftitem(":farming:apple_pie", {
+	description = "Apple Pie",
+	inventory_image = "farming_apple_pie.png",
+	on_use = minetest.item_eat(6),
+})
+
+minetest.register_craft({
+	output = "farming:apple_pie",
+	type = "shapeless",
+	recipe = {
+		"farming:flour", "farming:sugar",
+		"basictrees:tree_apple", "farming:baking_tray"
+	},
+	replacements = {{"farming:baking_tray", "farming:baking_tray"}}
+})
+
+
 minetest.register_node(":farming:salt", {
 	description = "Salt",
 	inventory_image = "farming_salt.png",

BIN
mods/farming_redo/textures/farming_apple_pie.png


BIN
mods/farming_redo/textures/farming_blueberry_pie.png


+ 11 - 11
mods/flowerpot/init.lua

@@ -280,20 +280,20 @@ if not flowerpot.loaded then
 		"flowers:geranium",
 		"flowers:chrysanthemum_green",
 		"flowers:rose",
-                "flowers:rose_white",
-                "flowers:zinnia_red",
+		"flowers:rose_white",
+		"flowers:zinnia_red",
 		"flowers:tulip",
 		"flowers:tulip_black",
 		"flowers:viola",
-                "flowers:foxglove_pink",
-                "flowers:bluebell",
-                "flowers:snapdragon",
-                "flowers:forgetmenot",
-                "flowers:poppy_orange",
-                "flowers:iris_black",
-                "flowers:daylily",
-                "flowers:lupine_purple",
-                "flowers:jack",
+		"flowers:foxglove_pink",
+		"flowers:bluebell",
+		"flowers:snapdragon",
+		"flowers:forgetmenot",
+		"flowers:poppy_orange",
+		"flowers:iris_black",
+		"flowers:daylily",
+		"flowers:lupine_purple",
+		"flowers:jack",
 
 		"flowers:mushroom_brown",
 		"flowers:mushroom_red",

+ 10 - 11
mods/flowers/init.lua

@@ -217,68 +217,67 @@ if not flowers.registered then
 			{-2 / 16, -0.5, -2 / 16, 2 / 16, 3 / 16, 2 / 16},
 			{color_black = 1, flammable = 1}
 		},
-                {
+		{
 			"zinnia_red",
 			"Red Zinnia",
 			{-5 / 16, -0.5, -5 / 16, 5 / 16, 5 / 16, 5 / 16},
 			{color_red = 1, flammable = 1}
 		},
-                {
+		{
 			"lupine_purple",
 			"Purple Lupine",
 			{-2 / 16, -0.5, -2 / 16, 2 / 16, 5 / 16, 2 / 16},
 			{color_violet = 1, flammable = 1}
 		},
-                  {
+		{
 			"jack",
 			"Jack in the Pulpit",
 			{-0.15, -0.5, -0.15, 0.15, 7 / 16, 0.15},
 			{color_dark_green = 1, flammable = 1}
 		},
-                {
+		{
 			"poppy_orange",
 			"Orange Poppy",
 			{-5 / 16, -0.5, -5 / 16, 5 / 16, 5 / 16, 5 / 16},
 			{color_orange = 1, flammable = 1}
 		},
-                {
+		{
 			"daylily",
 			"Daylily",
 			{-5 / 16, -0.5, -5 / 16, 5 / 16, 3 / 16, 5 / 16},
 			{color_yellow = 1, flammable = 1}
 		},
-                {
+		{
 			"iris_black",
 			"Black Iris",
 			{-2 / 16, -0.5, -2 / 16, 2 / 16, 3 / 16, 2 / 16},
 			{color_black = 1, flammable = 1}
 		},
-                {
+		{
 			"forgetmenot",
 			"Forget-Me-Not",
 			{-5 / 16, -0.5, -5 / 16, 5 / 16, -2 / 16, 5 / 16},
 			{color_cyan = 1, flammable = 1}
 		},
-                {
+		{
 			"snapdragon",
 			"Snapdragon",
 			{-5 / 16, -0.5, -5 / 16, 5 / 16, 1 / 16, 5 / 16},
 			{color_magenta = 1, flammable = 1}
 		},
-                {
+		{
 			"bluebell",
 			"Bluebell",
 			{-2 / 16, -0.5, -2 / 16, 2 / 16, 5 / 16, 2 / 16},
 			{color_blue = 1, flammable = 1}
 		},
-                {
+		{
 			"foxglove_pink",
 			"Pink Foxglove",
 			{-0.15, -0.5, -0.15, 0.15, 7 / 16, 0.15},
 			{color_pink = 1, flammable = 1}
 		},
 	}
-        
 
 	for _,item in pairs(flowers.datas) do
 		add_simple_flower(unpack(item))

+ 2 - 2
mods/itempickup/init.lua

@@ -157,7 +157,7 @@ local drop_xp_list = {
 	["quartz:quartz_crystal"] = 0.5,
 	["talinite:lump"] = 1.0,
 	["thorium:lump"] = 1.0,
-    ["titanium:titanium"] = 1.0,
+	["titanium:titanium"] = 1.0,
 	["uranium:lump"] = 1.0,
 	["zinc:lump"] = 1.0,
 	["sulfur:lump"] = 0.1,
@@ -197,7 +197,7 @@ local drop_extra_item_list = {
 	["quartz:quartz_crystal"] = true,
 	["talinite:lump"] = true,
 	["thorium:lump"] = true,
-    ["titanium:titanium"] = true,
+	["titanium:titanium"] = true,
 	["uranium:lump"] = true,
 	["zinc:lump"] = true,
 	["sulfur:lump"] = true,

+ 0 - 0
mods/machines/leecher.lua


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels