sixam/minetest
Template
2
0
Fork 0
mirror of https://github.com/luanti-org/minetest_game.git synced 2025-05-28 17:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/C1ffisme/minetest_game

Browse source 
Conflicts:
	mods/creative/init.lua
	mods/default/furnace.lua
	mods/default/init.lua
	mods/default/nodes.lua

Added Backgrounds
This commit is contained in:
C1ffisme 2015-01-26 14:30:17 -06:00
commit 2084435f3e
5 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored Normal file
View file

@ -0,0 +1,7 @@
## Generic ignorable patterns and files
*~
.*.swp
*bak*
tags
*.vim

4
mods/creative/init.lua
View file

@ -76,7 +76,11 @@ creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
"size[13,7.5]"..
--"image[6,0.6;1,2;player.png]"..
default.gui_bg..
<<<<<<< HEAD
"image[0,-0.5;16.5,11.25;default_inventory_bg.png]"..
=======
default.gui_bg_img..
>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
default.gui_slots..
"list[current_player;main;5,3.5;8,1;]"..
"list[current_player;main;5,4.75;8,3;8]"..

8
mods/default/furnace.lua
View file

@ -7,7 +7,11 @@ local function active_formspec(fuel_percent, item_percent)
local formspec =
"size[8,8.5]"..
default.gui_bg..
<<<<<<< HEAD
"image[-2,-0.5;15,11.25;default_furnace_bg.png]"..
=======
default.gui_bg_img..
>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
default.gui_slots..
"list[current_name;src;2.75,0.5;1,1;]"..
"list[current_name;fuel;2.75,2.5;1,1;]"..
@ -25,7 +29,11 @@ end
local inactive_formspec =
"size[8,8.5]"..
default.gui_bg..
<<<<<<< HEAD
"image[-2,-0.5;15,11.25;default_furnace_bg.png]"..
=======
default.gui_bg_img..
>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
default.gui_slots..
"list[current_name;src;2.75,0.5;1,1;]"..
"list[current_name;fuel;2.75,2.5;1,1;]"..

4
mods/default/init.lua
View file

@ -23,7 +23,11 @@ end
default.gui_suvival_form = "size[8,8.5]"..
default.gui_bg..
<<<<<<< HEAD
"image[-2,-0.5;15,11.25;default_inventory_bg.png]"..
=======
default.gui_bg_img..
>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
default.gui_slots..
"list[current_player;main;0,4.25;8,1;]"..
"list[current_player;main;0,5.5;8,3;8]"..

8
mods/default/nodes.lua
View file

@ -1101,7 +1101,11 @@ minetest.register_node("default:torch", {
local chest_formspec =
"size[8,9]"..
default.gui_bg..
<<<<<<< HEAD
"image[-2,-0.5;15,11.25;default_chest_bg.png]"..
=======
default.gui_bg_img..
>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
default.gui_slots..
"list[current_name;main;0,0.3;8,4;]"..
"list[current_player;main;0,4.85;8,1;]"..
@ -1113,7 +1117,11 @@ local function get_locked_chest_formspec(pos)
local formspec =
"size[8,9]"..
default.gui_bg..
<<<<<<< HEAD
"image[-2,-0.5;15,11.25;default_chest_bg.png]"..
=======
default.gui_bg_img..
>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
default.gui_slots..
"list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"..
"list[current_player;main;0,4.85;8,1;]"..