[minetest-mod-homedecor] 02/05: Merge tag 'upstream/0.4.16'
Julien Puydt
julien.puydt at laposte.net
Wed Jun 21 11:46:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository minetest-mod-homedecor.
commit 3175a7622f56dc8708d6c3ea7c2ac9451d859def
Merge: 58fa972 14ab20b
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Wed Jun 21 12:52:05 2017 +0200
Merge tag 'upstream/0.4.16'
Upstream version 0.4.16
# gpg: Signature faite le mer. 21 juin 2017 12:52:05 CEST
# gpg: avec la clef RSA 812EEFD8A3FBA4ACE4DF114B04C53BD7FE030551
# gpg: issuer "julien.puydt at laposte.net"
# gpg: Bonne signature de « Julien Puydt (Debian) <julien.puydt at laposte.net> » [inconnu]
# gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
# gpg: Rien n'indique que la signature appartient à son propriétaire.
# Empreinte de clef principale : 812E EFD8 A3FB A4AC E4DF 114B 04C5 3BD7 FE03 0551
.luacheckrc | 2 +
README | 65 +-
building_blocks/depends.txt | 3 +-
building_blocks/init.lua | 89 +-
chains/depends.txt | 3 +-
chains/init.lua | 17 +-
computer/computers.lua | 31 +-
computer/depends.txt | 3 +-
computer/miscitems.lua | 3 +-
computer/tetris.lua | 12 +-
computer/textures/computer_hueg_box_bk.png | Bin 0 -> 88 bytes
computer/textures/computer_hueg_box_bt.png | Bin 0 -> 108 bytes
computer/textures/computer_hueg_box_ft.png | Bin 0 -> 130 bytes
computer/textures/computer_hueg_box_lt.png | Bin 0 -> 100 bytes
computer/textures/computer_hueg_box_rt.png | Bin 0 -> 97 bytes
computer/textures/computer_hueg_box_tp.png | Bin 0 -> 220 bytes
fake_fire/depends.txt | 1 +
fake_fire/init.lua | 45 +-
homedecor/bathroom_furniture.lua | 161 +-
homedecor/bathroom_sanitation.lua | 73 +-
homedecor/bedroom.lua | 321 +-
homedecor/books.lua | 36 +-
homedecor/climate-control.lua | 6 +-
homedecor/clocks.lua | 28 +-
homedecor/cobweb.lua | 11 +-
homedecor/crafts.lua | 476 +-
homedecor/depends.txt | 3 +-
homedecor/doors_and_gates.lua | 39 +-
homedecor/electrics.lua | 11 +-
homedecor/electronics.lua | 8 +-
homedecor/exterior.lua | 8 +-
homedecor/fences.lua | 4 +-
homedecor/foyer.lua | 17 +-
homedecor/furniture.lua | 222 +-
homedecor/furniture_medieval.lua | 20 +-
homedecor/furniture_recipes.lua | 174 +-
homedecor/gastronomy.lua | 87 +-
homedecor/handlers/expansion.lua | 146 +-
homedecor/handlers/furnaces.lua | 2 +-
homedecor/handlers/inventory.lua | 9 +-
homedecor/init.lua | 27 +-
homedecor/kitchen_appliances.lua | 2 +-
homedecor/kitchen_furniture.lua | 6 +-
homedecor/laundry.lua | 2 +-
homedecor/lighting.lua | 582 +-
homedecor/locale/es.po | 1152 --
homedecor/locale/template.pot | 1152 --
homedecor/misc-nodes.lua | 24 +-
homedecor/models/forniture_armchair.obj | 358 +-
homedecor/models/homedecor_bathtub_clawfoot.obj | 17399 +++++++++++++++++++
homedecor/models/homedecor_bed_extended.obj | 314 +-
homedecor/models/homedecor_bed_kingsize.obj | 510 +-
homedecor/models/homedecor_bed_regular.obj | 302 +-
homedecor/models/homedecor_book.obj | 346 +-
homedecor/models/homedecor_book_open.obj | 713 +-
homedecor/models/homedecor_desk_lamp.obj | 3372 ++--
homedecor/models/homedecor_kitchen_chair.obj | 166 +-
homedecor/models/homedecor_toilet_open.obj | 1252 +-
homedecor/models/homedecor_window_shutter.obj | 154 +-
homedecor/models/plasma_lamp.obj | 202 +
homedecor/office.lua | 33 +-
homedecor/roofing.lua | 2 +-
homedecor/shutters.lua | 125 +-
homedecor/tables.lua | 5 +-
homedecor/textures/homedecor_armchair_inv.png | Bin 0 -> 6376 bytes
homedecor/textures/homedecor_bathroom_tiles_bg.png | Bin 190 -> 219 bytes
homedecor/textures/homedecor_bathroom_tiles_fg.png | Bin 381 -> 248 bytes
.../homedecor_bathtub_clawfoot_bottom_inside.png | Bin 0 -> 245 bytes
homedecor/textures/homedecor_bed_inv.png | Bin 5875 -> 6269 bytes
homedecor/textures/homedecor_bed_kingsize_inv.png | Bin 5752 -> 6178 bytes
.../homedecor_bed_kingsize_overlay_inv.png | Bin 1407 -> 0 bytes
homedecor/textures/homedecor_bed_overlay_inv.png | Bin 1260 -> 0 bytes
homedecor/textures/homedecor_book_cover.png | Bin 1899 -> 2339 bytes
homedecor/textures/homedecor_chair_padded_inv.png | Bin 0 -> 4554 bytes
homedecor/textures/homedecor_chair_wood_inv.png | Bin 0 -> 4411 bytes
homedecor/textures/homedecor_curtain.png | Bin 465 -> 295 bytes
homedecor/textures/homedecor_curtain_open.png | Bin 425 -> 276 bytes
homedecor/textures/homedecor_desk_lamp_inv.png | Bin 0 -> 1370 bytes
.../textures/homedecor_desk_lamp_metal_inv.png | Bin 1422 -> 0 bytes
.../textures/homedecor_desk_lamp_stem_inv.png | Bin 1493 -> 0 bytes
homedecor/textures/homedecor_gate_half_door_fb.png | Bin 0 -> 2085 bytes
homedecor/textures/homedecor_gate_half_door_lr.png | Bin 0 -> 684 bytes
homedecor/textures/homedecor_gate_half_door_tb.png | Bin 0 -> 421 bytes
.../textures/homedecor_gate_half_door_white_fb.png | Bin 0 -> 1080 bytes
.../textures/homedecor_gate_half_door_white_lr.png | Bin 0 -> 384 bytes
.../textures/homedecor_gate_half_door_white_tb.png | Bin 0 -> 310 bytes
homedecor/textures/homedecor_generic_metal.png | Bin 0 -> 218 bytes
.../textures/homedecor_generic_metal_black.png | Bin 211 -> 0 bytes
homedecor/textures/homedecor_generic_plastic.png | Bin 0 -> 226 bytes
.../textures/homedecor_generic_plastic_black.png | Bin 217 -> 0 bytes
.../homedecor_generic_wood_boards_overlay.png | Bin 98 -> 0 bytes
.../textures/homedecor_generic_wood_luxury.png | Bin 1314 -> 590 bytes
.../textures/homedecor_generic_wood_plain.png | Bin 605 -> 293 bytes
homedecor/textures/homedecor_glowlight_bottom.png | Bin 0 -> 95 bytes
.../textures/homedecor_glowlight_cube_sides.png | Bin 0 -> 93 bytes
.../homedecor_glowlight_cube_sides_overlay.png | Bin 0 -> 203 bytes
homedecor/textures/homedecor_glowlight_cube_tb.png | Bin 0 -> 94 bytes
.../homedecor_glowlight_cube_tb_overlay.png | Bin 0 -> 204 bytes
.../homedecor_glowlight_cube_white_sides.png | Bin 135 -> 0 bytes
...omedecor_glowlight_cube_white_sides_ceiling.png | Bin 138 -> 0 bytes
.../textures/homedecor_glowlight_cube_white_tb.png | Bin 140 -> 0 bytes
.../homedecor_glowlight_cube_yellow_sides.png | Bin 350 -> 0 bytes
...medecor_glowlight_cube_yellow_sides_ceiling.png | Bin 353 -> 0 bytes
.../homedecor_glowlight_cube_yellow_tb.png | Bin 352 -> 0 bytes
.../textures/homedecor_glowlight_thick_sides.png | Bin 0 -> 95 bytes
.../homedecor_glowlight_thick_sides_overlay.png | Bin 0 -> 307 bytes
.../homedecor_glowlight_thick_white_sides.png | Bin 178 -> 0 bytes
.../homedecor_glowlight_thick_yellow_sides.png | Bin 458 -> 0 bytes
.../textures/homedecor_glowlight_thin_sides.png | Bin 0 -> 96 bytes
.../homedecor_glowlight_thin_sides_overlay.png | Bin 0 -> 187 bytes
.../homedecor_glowlight_thin_white_sides.png | Bin 134 -> 0 bytes
.../homedecor_glowlight_thin_yellow_sides.png | Bin 317 -> 0 bytes
homedecor/textures/homedecor_glowlight_top.png | Bin 0 -> 93 bytes
.../textures/homedecor_glowlight_top_overlay.png | Bin 0 -> 423 bytes
.../textures/homedecor_glowlight_white_bottom.png | Bin 119 -> 0 bytes
.../textures/homedecor_glowlight_white_top.png | Bin 172 -> 0 bytes
.../textures/homedecor_glowlight_yellow_bottom.png | Bin 455 -> 0 bytes
.../textures/homedecor_glowlight_yellow_top.png | Bin 616 -> 0 bytes
homedecor/textures/homedecor_marble.png | Bin 818 -> 233 bytes
.../homedecor_table_standing_lamp_lightbulb.png | Bin 581 -> 594 bytes
homedecor/textures/homedecor_window_shutter.png | Bin 278 -> 278 bytes
.../textures/homedecor_window_shutter_inv.png | Bin 4871 -> 4879 bytes
homedecor/trash_cans.lua | 8 +-
homedecor/wardrobe.lua | 10 +-
homedecor/window_treatments.lua | 162 +-
{computer => homedecor_i18n}/depends.txt | 2 -
homedecor_i18n/init.lua | 7 +
{homedecor => homedecor_i18n}/intllib.lua | 0
homedecor_i18n/locale/de.po | 1926 ++
homedecor_i18n/locale/es.po | 1584 ++
homedecor_i18n/locale/fr.po | 1864 ++
homedecor_i18n/locale/it.po | 1948 +++
homedecor_i18n/locale/ms.po | 1948 +++
homedecor_i18n/locale/pt.po | 1848 ++
homedecor_i18n/locale/template.pot | 1549 ++
{homedecor => homedecor_i18n}/tools/updatepo.sh | 2 +
inbox/depends.txt | 2 +
inbox/init.lua | 30 +-
itemframes/depends.txt | 1 +
itemframes/init.lua | 37 +-
lavalamp/depends.txt | 4 +-
lavalamp/init.lua | 227 +-
lavalamp/textures/lavalamp_lamp_anim.png | Bin 0 -> 5640 bytes
lavalamp/textures/lavalamp_lamp_anim_blue.png | Bin 5123 -> 0 bytes
lavalamp/textures/lavalamp_lamp_anim_green.png | Bin 5187 -> 0 bytes
lavalamp/textures/lavalamp_lamp_anim_orange.png | Bin 5262 -> 0 bytes
lavalamp/textures/lavalamp_lamp_anim_red.png | Bin 5380 -> 0 bytes
lavalamp/textures/lavalamp_lamp_anim_violet.png | Bin 5269 -> 0 bytes
lavalamp/textures/lavalamp_lamp_anim_yellow.png | Bin 5279 -> 0 bytes
lavalamp/textures/lavalamp_lamp_blue_inv.png | Bin 2801 -> 0 bytes
lavalamp/textures/lavalamp_lamp_green_inv.png | Bin 2825 -> 0 bytes
...lamp_lamp_red_inv.png => lavalamp_lamp_inv.png} | Bin
lavalamp/textures/lavalamp_lamp_liquid.png | Bin 0 -> 412 bytes
lavalamp/textures/lavalamp_lamp_off.png | Bin 82 -> 86 bytes
lavalamp/textures/lavalamp_lamp_orange_inv.png | Bin 2907 -> 0 bytes
lavalamp/textures/lavalamp_lamp_violet_inv.png | Bin 2894 -> 0 bytes
lavalamp/textures/lavalamp_lamp_yellow_inv.png | Bin 2920 -> 0 bytes
lrfurn/armchairs.lua | 143 +-
lrfurn/coffeetable.lua | 96 +-
lrfurn/depends.txt | 2 +
lrfurn/endtable.lua | 9 +-
lrfurn/init.lua | 51 +-
lrfurn/longsofas.lua | 187 +-
lrfurn/models/lrfurn_armchair.obj | 478 +-
lrfurn/models/lrfurn_sofa_long.obj | 544 +-
lrfurn/models/lrfurn_sofa_short.obj | 440 +-
lrfurn/sofas.lua | 188 +-
lrfurn/textures/lrfurn_armchair_inv.png | Bin 0 -> 6841 bytes
lrfurn/textures/lrfurn_bg_white.png | Bin 121 -> 0 bytes
lrfurn/textures/lrfurn_longsofa_inv.png | Bin 0 -> 4423 bytes
lrfurn/textures/lrfurn_sofa_inv.png | Bin 0 -> 5297 bytes
lrfurn/textures/lrfurn_sofa_overlay.png | Bin 2855 -> 0 bytes
lrfurn/textures/lrfurn_upholstery.png | Bin 0 -> 2309 bytes
plasmascreen/depends.txt | 3 +-
plasmascreen/init.lua | 13 +-
175 files changed, 37300 insertions(+), 8349 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-mod-homedecor.git
More information about the Pkg-games-commits
mailing list