Commit Graph

1490 Commits

Author SHA1 Message Date
7bcfbbca3a Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-02-09 21:38:24 +01:00
Vanessa Dannenberg
ed41161554 Merge branch 'master' into 'master'
Fix door recipes

See merge request VanessaE/homedecor_modpack!8
2019-12-30 07:47:06 +00:00
OgelGames
77933d9dc3 fix recipes for mahogany closet and basic panel doors 2019-12-30 18:17:13 +11:00
e372ccb4d8 Merge branch 'master' of yunohost:mtcontrib/homedecor_modpack into nalc-1.2-dev 2019-12-22 13:26:45 +01:00
Vanessa Dannenberg
c118b43711 use signs_lib's custom pole check callback feature
requires signs_lib from commit dcdee22 or later, if present
2019-09-22 03:23:50 -04:00
Vanessa Dannenberg
f6da0f7329 fix the 'fix' 2019-09-19 20:55:56 -04:00
Vanessa Dannenberg
e84a184946 only try to process a light message if it's a string 2019-09-19 19:24:42 -04:00
Vanessa Dannenberg
0c9d883f28 Merge branch 'patch-1' into 'master'
Fix fg/bg texture setting in register_furnace

See merge request VanessaE/homedecor_modpack!7
2019-09-19 18:06:48 +00:00
James McManus
97e7a31830 Fix fg/bg texture setting in register_furnace
If a custom fire_bg texture had been provided (not currently done
within the modpack itself), fire_fg would have been set to that instead
of the provided fire_fg or default.
2019-09-19 12:50:01 +00:00
Vanessa Dannenberg
d897e6d97c update to use new signs_lib API -- requires signs_lib commit 4ff54c9a and above 2019-09-11 12:29:32 -04:00
Vanessa Dannenberg
8532dee8ed Merge branch 'cobweb_typo' into 'master'
Fix a typo in homedecor_cobweb/init.lua

See merge request VanessaE/homedecor_modpack!6
2019-08-27 12:38:49 +00:00
upsilon
356f872327
Fix a typo in homedecor_cobweb/init.lua
This typo made the server crash when placing a centered cobweb
2019-08-27 14:33:21 +02:00
Vanessa Dannenberg
6c07a31857 fix #20 (undeclared globals) 2019-08-21 17:44:58 -04:00
Vanessa Dannenberg
daef49a255 Merge branch 'beer-fix' into 'master'
Use API to replace beer mug

Closes #18

See merge request VanessaE/homedecor_modpack!5
2019-08-21 21:33:30 +00:00
Vanessa Dannenberg
1072598701 use Unified Dyes colorwallmounted mode
so that the spool of filament can be colorized.
2019-08-21 08:30:23 -04:00
Vanessa Dannenberg
60be4a6320 Add 3d printer (Prussa i3/"bedflinger" style) 2019-08-21 07:19:28 -04:00
Vanessa Dannenberg
67f2065408 split printer into separate file 2019-08-21 06:36:19 -04:00
Vanessa Dannenberg
f90834ff06 make "computer" mod depend on basic_materials 2019-08-21 06:34:37 -04:00
coil
c871e0d388
Use API to replace beer mug
Mods overriding minetest.do_item_eat can ensure that an empty glass
is given only if the item was actually used.

Fixes #18.
2019-08-17 22:23:13 -04:00
Vanessa Dannenberg
d17ec1d978 fix recipes for mahogany and white french doors 2019-08-14 14:16:09 -04:00
Vanessa Dannenberg
9dcc6c2b4d use Unified Dyes on_dig where needed - requires Unified Dyes commit 9ff40a7f or later 2019-07-18 02:16:46 -04:00
Vanessa Dannenberg
80352d69e1 prevent crash if receiving a null message string or channel 2019-07-16 06:45:04 -04:00
Vanessa Dannenberg
1d59c2258d depends fixes
make sure player_api and 3d_armor load before wardrobe
2019-06-25 16:06:49 -04:00
Vanessa Dannenberg
11e6b5d92a fix door recipes
(all still pointed to old node names)
2019-06-20 17:15:38 -04:00
Vanessa Dannenberg
7e7b2bcabb use table.copy instead of own clone node 2019-06-18 15:04:08 -04:00
Vanessa Dannenberg
b28f1314da add aliases for rope lights (on/14, off/0)
make right-click handler work properly for plain "on"/"off" items
2019-06-15 06:52:58 -04:00
Vanessa Dannenberg
17ea2040e2 fix groups on "floor" rope lights
if mesecons, put "off" rope lights in creative inv, and drop them as "off" as
well.  else, put "on" in creative inv and drop "on"

allow right-click on rope lights only if no mesecons

also cache minetest.get_modpath("mesecons")
2019-06-15 06:45:41 -04:00
Vanessa Dannenberg
ed9fb6a34d allow player to open/close curtains without a curtainrod
also remove "closed" curtain from creative inv
change recipe to give the "open" one
2019-06-07 05:41:16 -04:00
Vanessa Dannenberg
13862c1a48 missing chandelier alias 2019-06-07 00:50:06 -04:00
Vanessa Dannenberg
e289e79aea add intllib as optdepend in homedecor_common
should fix #17 ?
2019-06-07 00:36:05 -04:00
Vanessa Dannenberg
80ab12710b add "light" to a couple of descriptions, for easier searching 2019-06-06 04:38:13 -04:00
Vanessa Dannenberg
1b94c940d7 fix wrong light value on standing lamps 2019-06-06 04:37:26 -04:00
Vanessa Dannenberg
df44dd3dad remove some bogus aliases, fix plasma ball 2019-06-06 01:48:44 -04:00
Vanessa Dannenberg
bff90189fc fixed french door conversions, for real now. :P
bumped LBM version
2019-06-06 01:17:43 -04:00
Vanessa Dannenberg
b407f06dc4 fix wall lantern aliases, for real this time :P 2019-06-06 01:03:57 -04:00
Vanessa Dannenberg
e6dc2c5508 bump doors LBM name to force it to run again 2019-06-05 06:16:33 -04:00
Vanessa Dannenberg
bde2bf2bf6 fix some missing door LBM entries 2019-06-05 04:26:22 -04:00
Vanessa Dannenberg
ea160a6519 simplify mesecons/digilines rules
replaced all "xz" and "toponly" with "alldir"
made on-floor rope lights use "alldir"
2019-06-04 01:37:02 -04:00
Vanessa Dannenberg
631813bb2d make all dimmable lights fully dimmable to any level 0-14
for backward compat, they'll resond to the usual strings, too:

"off" -> 0
"min" -> 3
"med" -> 7
"hi"  -> 11
"max"/"on" -> 14

all dimmable nodes have been renamed to bear the light value in their
names, and aliased.

the non-dimmable lights still respond as before
("off" or n < 4; "on" or n > 3)
2019-06-04 00:56:00 -04:00
Vanessa Dannenberg
f33636d473 move wall lamp and torch models to the correct dir 2019-06-03 07:17:12 -04:00
Vanessa Dannenberg
cbb41f7d98 give most doors more meaningful, distinct node names
to avoid confusion

doors:wood_glass_{oak,white,mahogany}_{a,b} --> doors:homedecor_french_{oak,white,mahogany}_{a,b}
doors:woodglass2_{a,b}                      --> doors:homedecor_carolina_{a,b}
doors:bedroom_{a,b}                         --> doors:homedecor_basic_panel_{a,b}

All others:
doors:$foo_{a,b}                            --> doors:homedecor_$foo_{a,b}
2019-06-03 03:42:06 -04:00
Vanessa Dannenberg
c98ec41ba7 move some images to the right places :P 2019-06-02 08:24:13 -04:00
Vanessa Dannenberg
84c3933fd4 fix wrong textures on a couple of lamps 2019-06-02 03:16:00 -04:00
Vanessa Dannenberg
968cdfd549 rope lights are not dimmable 2019-06-02 03:13:46 -04:00
Vanessa Dannenberg
c457874d03 fix bad not-in-creative-inventory flags on wall lamp and plasma ball 2019-06-02 02:51:41 -04:00
Vanessa Dannenberg
67acbd6d59 fix not being able to right-click table and standing lamps 2019-06-02 02:47:46 -04:00
Vanessa Dannenberg
fdb37bdaf5 fix wrong colorization table usage in table, standing, and desk lamps 2019-06-02 02:45:01 -04:00
Vanessa Dannenberg
ab8bf5586f move "medieval" wall lamp and torch to homedecor_lighting
make them mesecon/digiline controllable (on/off only, alldir rules)

also fix a couple of old texture references
2019-06-02 02:37:02 -04:00
Vanessa Dannenberg
2f3c12eb2a rename and move generic light source textures 2019-06-02 02:23:10 -04:00
Vanessa Dannenberg
4174737a1a make most presently non-dimmable lights dimmable
merge table and standing lamps into the new code

of all the relevant lights, the plasma ball is the only one that remains
on/off-only, since dimmable doesn't make sense there.

That one, and any future lights that get the on/off-only treatment, will
use the previous on/off behavior, i.e. turn off with the messages "off"
or "low" or a number < 4, and turn on with "med", "hi", "max", "on" or
a number > 3

This alters the behavior of table/standing lamps - they will no longer
cycle brightnesses by right-click.  Like all other controllable lights,
they'll just toggle on/off.  If there's enough demand for it, I'll add
that feature back in at a later date.
2019-06-02 02:11:15 -04:00