Merge branch 'master' of yunohost:mtcontrib/homedecor_modpack into nalc-1.2-dev

2019-12-22 13:26:45 +01:00
parent 5c6a994698 c118b43711
commit e372ccb4d8
155 changed files with 17097 additions and 3894 deletions
--- a/homedecor_common/depends.txt
+++ b/homedecor_common/depends.txt
@@ -1,3 +1,3 @@
 default
 creative
-
+intllib?
--- a/homedecor_common/furnaces.lua
+++ b/homedecor_common/furnaces.lua
@@ -80,7 +80,7 @@ local furnace_can_dig = function(pos,player)
 end

 function homedecor.register_furnace(name, furnacedef)
-	furnacedef.fire_fg = furnacedef.fire_bg or "default_furnace_fire_fg.png"
+	furnacedef.fire_fg = furnacedef.fire_fg or "default_furnace_fire_fg.png"
 	furnacedef.fire_bg = furnacedef.fire_bg or "default_furnace_fire_bg.png"

 	furnacedef.output_slots = furnacedef.output_slots or 4
--- a/homedecor_common/textures/homedecor_light.png
+++ b/homedecor_common/textures/homedecor_light.png