[minetest-mod-3d-armor] 03/07: Merge tag 'upstream/0.4.6'

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-3d-armor.

commit 2c500a72705c8609943b9195f56cdb4a4eeafb0f
Merge: 0f712c9 9c0fbaf
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Jan 11 21:23:27 2017 +0100

    Merge tag 'upstream/0.4.6'
    
    Upstream version 0.4.6
    
    # gpg: Signature faite le mer. 11 janv. 2017 21:23:16 CET
    # 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

 3d_armor/LICENSE.txt                     |   7 +++++++
 3d_armor/armor.lua                       |  15 +++++++++++++--
 3d_armor/models/3d_armor_character.b3d   | Bin 141046 -> 141046 bytes
 3d_armor/models/3d_armor_character.blend | Bin 991996 -> 711484 bytes
 3d_armor_stand/LICENSE.txt               |   4 ++--
 LICENSE.md                               |   6 ++----
 README.md                                |   2 +-
 hazmat_suit/LICENSE.txt                  |   7 +++++++
 hazmat_suit/README.txt                   |   4 ++--
 shields/LICENSE.txt                      |   6 ++++++
 shields/README.txt                       |   3 +++
 technic_armor/LICENSE.txt                |   7 +++++++
 technic_armor/README.txt                 |   2 +-
 wieldview/LICENSE.txt                    |   5 +++++
 14 files changed, 56 insertions(+), 12 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-mod-3d-armor.git