merge upstream

damn wsl
use basic_materials steel bar instead or wrought iron pole
2020-02-28 21:16:18 +01:00 · 2020-02-28 21:00:46 +01:00 · 2020-02-28 11:39:35 -05:00 · 2020-02-26 14:13:16 +00:00 · 2020-02-26 10:43:11 +00:00 · 2019-05-31 10:41:06 +02:00
896 changed files with 46 additions and 41 deletions
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/bower.json
+++ b/bower.json
--- a/building_blocks/alias.lua
+++ b/building_blocks/alias.lua
--- a/building_blocks/depends.txt
+++ b/building_blocks/depends.txt
--- a/building_blocks/init.lua
+++ b/building_blocks/init.lua
--- a/building_blocks/node_stairs.lua
+++ b/building_blocks/node_stairs.lua
--- a/building_blocks/others.lua
+++ b/building_blocks/others.lua
--- a/building_blocks/recipes.lua
+++ b/building_blocks/recipes.lua
--- a/building_blocks/textures/building_blocks_Adobe.png
+++ b/building_blocks/textures/building_blocks_Adobe.png
--- a/building_blocks/textures/building_blocks_BWtile.png
+++ b/building_blocks/textures/building_blocks_BWtile.png
--- a/building_blocks/textures/building_blocks_Roofing.png
+++ b/building_blocks/textures/building_blocks_Roofing.png
--- a/building_blocks/textures/building_blocks_brobble.png
+++ b/building_blocks/textures/building_blocks_brobble.png
--- a/building_blocks/textures/building_blocks_brobble_spread_inv.png
+++ b/building_blocks/textures/building_blocks_brobble_spread_inv.png
--- a/building_blocks/textures/building_blocks_bwtile_inv.png
+++ b/building_blocks/textures/building_blocks_bwtile_inv.png
--- a/building_blocks/textures/building_blocks_cast_iron.png
+++ b/building_blocks/textures/building_blocks_cast_iron.png
--- a/building_blocks/textures/building_blocks_cast_iron_fireplace.png
+++ b/building_blocks/textures/building_blocks_cast_iron_fireplace.png
--- a/building_blocks/textures/building_blocks_grate.png
+++ b/building_blocks/textures/building_blocks_grate.png
--- a/building_blocks/textures/building_blocks_grate2.png
+++ b/building_blocks/textures/building_blocks_grate2.png
--- a/building_blocks/textures/building_blocks_gravel_spread_inv.png
+++ b/building_blocks/textures/building_blocks_gravel_spread_inv.png
--- a/building_blocks/textures/building_blocks_hardwood.png
+++ b/building_blocks/textures/building_blocks_hardwood.png
--- a/building_blocks/textures/building_blocks_knife.png
+++ b/building_blocks/textures/building_blocks_knife.png
--- a/building_blocks/textures/building_blocks_marble.png
+++ b/building_blocks/textures/building_blocks_marble.png
--- a/building_blocks/textures/building_blocks_sglass.png
+++ b/building_blocks/textures/building_blocks_sglass.png
--- a/building_blocks/textures/building_blocks_sticks.png
+++ b/building_blocks/textures/building_blocks_sticks.png
--- a/building_blocks/textures/building_blocks_tar.png
+++ b/building_blocks/textures/building_blocks_tar.png
--- a/building_blocks/textures/building_blocks_tar_base.png
+++ b/building_blocks/textures/building_blocks_tar_base.png
--- a/building_blocks/textures/building_blocks_tar_spread_inv.png
+++ b/building_blocks/textures/building_blocks_tar_spread_inv.png
--- a/building_blocks/textures/building_blocks_towel.png
+++ b/building_blocks/textures/building_blocks_towel.png
--- a/building_blocks/textures/building_blocks_towel_inv.png
+++ b/building_blocks/textures/building_blocks_towel_inv.png
--- a/building_blocks/textures/building_blocks_wglass.png
+++ b/building_blocks/textures/building_blocks_wglass.png
--- a/building_blocks/textures/technic_granite.png
+++ b/building_blocks/textures/technic_granite.png
--- a/computer/CHANGES.txt
+++ b/computer/CHANGES.txt
--- a/computer/README.txt
+++ b/computer/README.txt
--- a/computer/TODO.txt
+++ b/computer/TODO.txt
--- a/computer/computers.lua
+++ b/computer/computers.lua
--- a/computer/depends.txt
+++ b/computer/depends.txt
--- a/computer/init.lua
+++ b/computer/init.lua
--- a/computer/models/computer_laptop.obj
+++ b/computer/models/computer_laptop.obj
--- a/computer/models/computer_laptop_closed.obj
+++ b/computer/models/computer_laptop_closed.obj
--- a/computer/models/computer_monitor.obj
+++ b/computer/models/computer_monitor.obj
--- a/computer/models/computer_tower.obj
+++ b/computer/models/computer_tower.obj
--- a/computer/models/tetris_arcade.obj
+++ b/computer/models/tetris_arcade.obj
--- a/computer/recipes.lua
+++ b/computer/recipes.lua
--- a/computer/tetris.lua
+++ b/computer/tetris.lua
@ -1,4 +1,3 @@
-
 local S = homedecor.gettext

 local shapes = {
@ -220,10 +219,10 @@ local function step(pos, fields)
 	if fields then
 		if fields.new then
 			new_game(pos)
-		else
+		elseif t then
 			key(fields)
 		end
-	else
+	elseif t then
 		run = tick()
 	end

--- a/computer/textures/computer_ad128_inv.png
+++ b/computer/textures/computer_ad128_inv.png
--- a/computer/textures/computer_ad64_inv.png
+++ b/computer/textures/computer_ad64_inv.png
--- a/computer/textures/computer_admiral128_bk.png
+++ b/computer/textures/computer_admiral128_bk.png
--- a/computer/textures/computer_admiral128_bt.png
+++ b/computer/textures/computer_admiral128_bt.png
--- a/computer/textures/computer_admiral128_ft.png
+++ b/computer/textures/computer_admiral128_ft.png
--- a/computer/textures/computer_admiral128_lt.png
+++ b/computer/textures/computer_admiral128_lt.png
--- a/computer/textures/computer_admiral128_rt.png
+++ b/computer/textures/computer_admiral128_rt.png
--- a/computer/textures/computer_admiral128_tp.png
+++ b/computer/textures/computer_admiral128_tp.png
--- a/computer/textures/computer_admiral64_bk.png
+++ b/computer/textures/computer_admiral64_bk.png
--- a/computer/textures/computer_admiral64_bt.png
+++ b/computer/textures/computer_admiral64_bt.png
--- a/computer/textures/computer_admiral64_ft.png
+++ b/computer/textures/computer_admiral64_ft.png
--- a/computer/textures/computer_admiral64_lt.png
+++ b/computer/textures/computer_admiral64_lt.png
--- a/computer/textures/computer_admiral64_rt.png
+++ b/computer/textures/computer_admiral64_rt.png
--- a/computer/textures/computer_admiral64_tp.png
+++ b/computer/textures/computer_admiral64_tp.png
--- a/computer/textures/computer_black.png
+++ b/computer/textures/computer_black.png
--- a/computer/textures/computer_blue.png
+++ b/computer/textures/computer_blue.png
--- a/computer/textures/computer_computer_front_old.png
+++ b/computer/textures/computer_computer_front_old.png
--- a/computer/textures/computer_computer_top_old.png
+++ b/computer/textures/computer_computer_top_old.png
--- a/computer/textures/computer_cyan.png
+++ b/computer/textures/computer_cyan.png
--- a/computer/textures/computer_green.png
+++ b/computer/textures/computer_green.png
--- a/computer/textures/computer_hueg_box_bk.png
+++ b/computer/textures/computer_hueg_box_bk.png
--- a/computer/textures/computer_hueg_box_bt.png
+++ b/computer/textures/computer_hueg_box_bt.png
--- a/computer/textures/computer_hueg_box_ft.png
+++ b/computer/textures/computer_hueg_box_ft.png
--- a/computer/textures/computer_hueg_box_lt.png
+++ b/computer/textures/computer_hueg_box_lt.png
--- a/computer/textures/computer_hueg_box_rt.png
+++ b/computer/textures/computer_hueg_box_rt.png
--- a/computer/textures/computer_hueg_box_tp.png
+++ b/computer/textures/computer_hueg_box_tp.png
--- a/computer/textures/computer_laptop.png
+++ b/computer/textures/computer_laptop.png
--- a/computer/textures/computer_laptop_inv.png
+++ b/computer/textures/computer_laptop_inv.png
--- a/computer/textures/computer_magenta.png
+++ b/computer/textures/computer_magenta.png
--- a/computer/textures/computer_monitor_inv.png
+++ b/computer/textures/computer_monitor_inv.png
--- a/computer/textures/computer_orange.png
+++ b/computer/textures/computer_orange.png
--- a/computer/textures/computer_piepad_inv.png
+++ b/computer/textures/computer_piepad_inv.png
--- a/computer/textures/computer_piepad_inv_off.png
+++ b/computer/textures/computer_piepad_inv_off.png
--- a/computer/textures/computer_printer_b.png
+++ b/computer/textures/computer_printer_b.png
--- a/computer/textures/computer_printer_bt.png
+++ b/computer/textures/computer_printer_bt.png
--- a/computer/textures/computer_printer_f.png
+++ b/computer/textures/computer_printer_f.png
--- a/computer/textures/computer_printer_inv.png
+++ b/computer/textures/computer_printer_inv.png
--- a/computer/textures/computer_printer_l.png
+++ b/computer/textures/computer_printer_l.png
--- a/computer/textures/computer_printer_r.png
+++ b/computer/textures/computer_printer_r.png
--- a/computer/textures/computer_printer_t.png
+++ b/computer/textures/computer_printer_t.png
--- a/computer/textures/computer_ps1_inv.png
+++ b/computer/textures/computer_ps1_inv.png
--- a/computer/textures/computer_ps2_inv.png
+++ b/computer/textures/computer_ps2_inv.png
--- a/computer/textures/computer_red.png
+++ b/computer/textures/computer_red.png
--- a/computer/textures/computer_router_b.png
+++ b/computer/textures/computer_router_b.png
--- a/computer/textures/computer_router_bt.png
+++ b/computer/textures/computer_router_bt.png
--- a/computer/textures/computer_router_f.png
+++ b/computer/textures/computer_router_f.png
--- a/computer/textures/computer_router_f_animated.png
+++ b/computer/textures/computer_router_f_animated.png
--- a/computer/textures/computer_router_inv.png
+++ b/computer/textures/computer_router_inv.png
--- a/computer/textures/computer_router_l.png
+++ b/computer/textures/computer_router_l.png
--- a/computer/textures/computer_router_r.png
+++ b/computer/textures/computer_router_r.png
--- a/computer/textures/computer_router_t.png
+++ b/computer/textures/computer_router_t.png
--- a/computer/textures/computer_server_bt.png
+++ b/computer/textures/computer_server_bt.png
--- a/computer/textures/computer_server_f_off.png
+++ b/computer/textures/computer_server_f_off.png
--- a/computer/textures/computer_server_f_on.png
+++ b/computer/textures/computer_server_f_on.png
--- a/computer/textures/computer_server_inv.png
+++ b/computer/textures/computer_server_inv.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Milan	7d67e3dcd0	merge upstream	2020-02-28 21:16:18 +01:00
Milan	54f4bbb5f6	damn wsl	2020-02-28 21:00:46 +01:00
Vanessa Dannenberg	43333687bd	use basic_materials steel bar instead or wrought iron pole where it makes sense: chairs, benches, barbecue, and sport bench will now use the steel bar. wrought iron doors and fences, banister, spiral staircase, curtainrod, and window/jail bars will keep the wrought iron pole.	2020-02-28 11:39:35 -05:00
Vanessa Dannenberg	9ec3eab6f4	Merge branch 'master' into 'master' Add nil checks in tetris step function Closes #22 See merge request VanessaE/homedecor_modpack!9	2020-02-26 14:13:16 +00:00
OgelGames	9f5cc15e62	add nil checks in tetris step function	2020-02-26 10:43:11 +00:00
Milan	5c8d3367e6	we don't want the darkage lamp	2019-05-31 10:41:06 +02:00
Milan	153787be45	add chandelier alias	2019-03-07 12:46:00 +01:00
Milan	f454d833cf	merge upstream (with tmp workaround at misc-nodes:535)	2019-03-06 22:49:08 +01:00
Milan	b8481a5916	merge upstream	2019-03-06 22:32:01 +01:00
Milan*	f41f09c005	trying to tidy some things	2017-09-11 22:55:09 +02:00
Milan*	e6f7b27588	resolve mergeconflicts	2017-09-11 22:43:13 +02:00
Milan*	3aa0951941	fix mergeconflicts	2017-07-30 12:04:18 +02:00
Milan*	1d601dcdc5	drop one more 'settings:get' function hopefully without breaking anything update old 'm' variable to 'name' in fake_fire (leftover from previous merge)	2017-05-21 23:02:38 +02:00
Milan*	dd8b9e1031	drop 'settings:get' functions, fix faulty depends.txt in building_blocks	2017-05-21 22:35:34 +02:00
Milan*	ab58ec94e5	fix mergeconflicts	2017-05-21 22:14:09 +02:00
Vanessa Ezekowitz	ab94f9dc6a	Merge pull request #364 from AntumDeluge/settings Replace deprecated methods	2017-05-18 05:34:45 -04:00
AntumDeluge	4d6f0c07c2	Replace deprecated methods: - 'setting_get' with 'settings:get' - 'setting_getbool' with 'settings:get_bool'	2017-05-13 00:15:26 -07:00
Vanessa Ezekowitz	5fb16c4e33	don't crash if placing bed on top of bed when not in auto-color mode.	2017-03-31 12:59:26 -04:00
Vanessa Ezekowitz	b37e6ade7a	use unified dyes auto-colorization feature also fixed some bugs in bed handling also got rid of the old, obsolete "placeholder" node, aliased it to air.	2017-03-18 05:51:46 -04:00
Vanessa Ezekowitz	c79f14bd89	use unified dyes on_construct handler to set 256-color palette meta key on place for those nodes that use it	2017-03-14 02:13:17 -04:00
Vanessa Ezekowitz	e2a04b52b9	don't reference lrfurn chair colors in homedecor chair LBM use a local copy instead	2017-03-11 21:21:17 -05:00
Vanessa Ezekowitz	5dde3896f3	Merge pull request #360 from Thomas--S/patch-1 Make Wrought Iron Fence 2 recipe more generous	2017-03-11 14:59:49 -05:00
Milan*	d75f8a41c6	merge upstream 🐈	2017-01-02 17:22:12 +01:00
Milan*	f4d60800e8	fake_fire: add moreblocks crafting option to {stone,sandstone} chimney	2017-01-02 17:21:48 +01:00
tchncs	8638435b42	merge minetest-mods/homedecor_modpack	2016-11-06 20:54:16 +01:00
tchncs	6b396cf150	fix mergeconflict	2016-09-29 17:45:23 +02:00
tchncs	d178bde1f7	fix sglass id for moreblocks 🐈	2016-09-05 09:53:16 +02:00
tchncs	4cc5b7c79f	add building_blocks:smoothglass to moreblocks	2016-09-05 09:41:25 +02:00
tchncs	4df9553ced	add alias for building_blocks:slab_marble	2016-08-20 19:39:11 +02:00
tchncs	37d4ec14b6	(wip?) replace group:marble with darkage:marble	2016-08-20 12:19:44 +02:00
tchncs	300c2f94a1	(wip?) replace building_blocks:Marble with darkage:marble	2016-08-20 11:56:08 +02:00
tchncs	c0917a2d8c	lrfurn: fix sit animation for armchairs, longsofas and sofas	2016-08-03 22:26:45 +02:00
tchncs	b9a362b10e	fix furniture kitchen chair sit functionallity and add it to furniture armchair	2016-07-28 21:01:00 +02:00
tchncs	b436eefd33	pedestal: use default stone texture	2016-07-18 10:44:22 +02:00
Milan*	303b869e4a	dont do wardrobe	2016-06-09 12:28:05 +02:00