[minetest-mod-3d-armor] 02/03: Merge tag 'upstream/0.4.8'

Julien Puydt julien.puydt at laposte.net
Tue Mar 14 21:49:01 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-3d-armor.

commit 6b796983751e5ef3c0cc6f40bc32faeacfd2a6d7
Merge: ddd6508 559c787
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Tue Mar 14 15:25:35 2017 +0100

    Merge tag 'upstream/0.4.8'
    
    Upstream version 0.4.8
    
    # gpg: Signature faite le mar. 14 mars 2017 15:25:24 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                               |   4 +-
 3d_armor/README.txt                                |   3 +-
 3d_armor/armor.lua                                 | 213 ++++++----
 3d_armor/depends.txt                               |   3 +
 3d_armor/init.lua                                  |   2 +-
 3d_armor/textures/3d_armor_boots_admin.png         | Bin 291 -> 2980 bytes
 3d_armor/textures/3d_armor_boots_admin_preview.png | Bin 1413 -> 242 bytes
 3d_armor/textures/3d_armor_boots_bronze.png        | Bin 321 -> 2958 bytes
 .../textures/3d_armor_boots_bronze_preview.png     | Bin 1446 -> 208 bytes
 3d_armor/textures/3d_armor_boots_cactus.png        | Bin 308 -> 3120 bytes
 .../textures/3d_armor_boots_cactus_preview.png     | Bin 1413 -> 264 bytes
 3d_armor/textures/3d_armor_boots_crystal.png       | Bin 494 -> 2971 bytes
 .../textures/3d_armor_boots_crystal_preview.png    | Bin 2009 -> 248 bytes
 3d_armor/textures/3d_armor_boots_diamond.png       | Bin 295 -> 2969 bytes
 .../textures/3d_armor_boots_diamond_preview.png    | Bin 1460 -> 242 bytes
 3d_armor/textures/3d_armor_boots_gold.png          | Bin 287 -> 2946 bytes
 3d_armor/textures/3d_armor_boots_gold_preview.png  | Bin 1413 -> 206 bytes
 3d_armor/textures/3d_armor_boots_mithril.png       | Bin 216 -> 2958 bytes
 .../textures/3d_armor_boots_mithril_preview.png    | Bin 1387 -> 210 bytes
 3d_armor/textures/3d_armor_boots_steel.png         | Bin 316 -> 2943 bytes
 3d_armor/textures/3d_armor_boots_steel_preview.png | Bin 1460 -> 196 bytes
 3d_armor/textures/3d_armor_boots_wood.png          | Bin 274 -> 2997 bytes
 3d_armor/textures/3d_armor_boots_wood_preview.png  | Bin 1424 -> 282 bytes
 3d_armor/textures/3d_armor_chestplate_admin.png    | Bin 782 -> 3158 bytes
 .../textures/3d_armor_chestplate_admin_preview.png | Bin 1269 -> 314 bytes
 3d_armor/textures/3d_armor_chestplate_bronze.png   | Bin 556 -> 3077 bytes
 .../3d_armor_chestplate_bronze_preview.png         | Bin 1296 -> 280 bytes
 3d_armor/textures/3d_armor_chestplate_cactus.png   | Bin 712 -> 3476 bytes
 .../3d_armor_chestplate_cactus_preview.png         | Bin 1269 -> 456 bytes
 3d_armor/textures/3d_armor_chestplate_crystal.png  | Bin 1313 -> 3147 bytes
 .../3d_armor_chestplate_crystal_preview.png        | Bin 1738 -> 318 bytes
 3d_armor/textures/3d_armor_chestplate_diamond.png  | Bin 475 -> 3152 bytes
 .../3d_armor_chestplate_diamond_preview.png        | Bin 1221 -> 300 bytes
 3d_armor/textures/3d_armor_chestplate_gold.png     | Bin 430 -> 3075 bytes
 .../textures/3d_armor_chestplate_gold_preview.png  | Bin 1187 -> 276 bytes
 3d_armor/textures/3d_armor_chestplate_mithril.png  | Bin 669 -> 3077 bytes
 .../3d_armor_chestplate_mithril_preview.png        | Bin 1425 -> 284 bytes
 3d_armor/textures/3d_armor_chestplate_steel.png    | Bin 537 -> 3059 bytes
 .../textures/3d_armor_chestplate_steel_preview.png | Bin 1296 -> 281 bytes
 3d_armor/textures/3d_armor_chestplate_wood.png     | Bin 453 -> 3146 bytes
 .../textures/3d_armor_chestplate_wood_preview.png  | Bin 1192 -> 362 bytes
 3d_armor/textures/3d_armor_helmet_admin.png        | Bin 463 -> 3035 bytes
 .../textures/3d_armor_helmet_admin_preview.png     | Bin 883 -> 192 bytes
 3d_armor/textures/3d_armor_helmet_bronze.png       | Bin 583 -> 3094 bytes
 .../textures/3d_armor_helmet_bronze_preview.png    | Bin 891 -> 225 bytes
 3d_armor/textures/3d_armor_helmet_cactus.png       | Bin 533 -> 3310 bytes
 .../textures/3d_armor_helmet_cactus_preview.png    | Bin 883 -> 253 bytes
 3d_armor/textures/3d_armor_helmet_crystal.png      | Bin 1176 -> 3020 bytes
 .../textures/3d_armor_helmet_crystal_preview.png   | Bin 1243 -> 184 bytes
 3d_armor/textures/3d_armor_helmet_diamond.png      | Bin 508 -> 3031 bytes
 .../textures/3d_armor_helmet_diamond_preview.png   | Bin 902 -> 185 bytes
 3d_armor/textures/3d_armor_helmet_gold.png         | Bin 475 -> 3071 bytes
 3d_armor/textures/3d_armor_helmet_gold_preview.png | Bin 893 -> 215 bytes
 3d_armor/textures/3d_armor_helmet_mithril.png      | Bin 511 -> 3091 bytes
 .../textures/3d_armor_helmet_mithril_preview.png   | Bin 853 -> 226 bytes
 3d_armor/textures/3d_armor_helmet_steel.png        | Bin 549 -> 3064 bytes
 .../textures/3d_armor_helmet_steel_preview.png     | Bin 887 -> 202 bytes
 3d_armor/textures/3d_armor_helmet_wood.png         | Bin 472 -> 3203 bytes
 3d_armor/textures/3d_armor_helmet_wood_preview.png | Bin 878 -> 186 bytes
 3d_armor/textures/3d_armor_inv_boots_admin.png     | Bin 129 -> 2939 bytes
 3d_armor/textures/3d_armor_inv_boots_bronze.png    | Bin 129 -> 2933 bytes
 3d_armor/textures/3d_armor_inv_boots_cactus.png    | Bin 129 -> 3065 bytes
 3d_armor/textures/3d_armor_inv_boots_crystal.png   | Bin 200 -> 2932 bytes
 3d_armor/textures/3d_armor_inv_boots_diamond.png   | Bin 129 -> 2932 bytes
 3d_armor/textures/3d_armor_inv_boots_gold.png      | Bin 129 -> 2930 bytes
 3d_armor/textures/3d_armor_inv_boots_mithril.png   | Bin 129 -> 2933 bytes
 3d_armor/textures/3d_armor_inv_boots_steel.png     | Bin 129 -> 2916 bytes
 3d_armor/textures/3d_armor_inv_boots_wood.png      | Bin 129 -> 3037 bytes
 .../textures/3d_armor_inv_chestplate_admin.png     | Bin 142 -> 2984 bytes
 .../textures/3d_armor_inv_chestplate_bronze.png    | Bin 142 -> 2996 bytes
 .../textures/3d_armor_inv_chestplate_cactus.png    | Bin 142 -> 3155 bytes
 .../textures/3d_armor_inv_chestplate_crystal.png   | Bin 236 -> 2969 bytes
 .../textures/3d_armor_inv_chestplate_diamond.png   | Bin 142 -> 2968 bytes
 3d_armor/textures/3d_armor_inv_chestplate_gold.png | Bin 142 -> 2976 bytes
 .../textures/3d_armor_inv_chestplate_mithril.png   | Bin 142 -> 2994 bytes
 .../textures/3d_armor_inv_chestplate_steel.png     | Bin 142 -> 2986 bytes
 3d_armor/textures/3d_armor_inv_chestplate_wood.png | Bin 142 -> 3067 bytes
 3d_armor/textures/3d_armor_inv_helmet_admin.png    | Bin 140 -> 2910 bytes
 3d_armor/textures/3d_armor_inv_helmet_bronze.png   | Bin 140 -> 2907 bytes
 3d_armor/textures/3d_armor_inv_helmet_cactus.png   | Bin 140 -> 2995 bytes
 3d_armor/textures/3d_armor_inv_helmet_crystal.png  | Bin 219 -> 2897 bytes
 3d_armor/textures/3d_armor_inv_helmet_diamond.png  | Bin 140 -> 2897 bytes
 3d_armor/textures/3d_armor_inv_helmet_gold.png     | Bin 140 -> 2913 bytes
 3d_armor/textures/3d_armor_inv_helmet_mithril.png  | Bin 140 -> 2911 bytes
 3d_armor/textures/3d_armor_inv_helmet_steel.png    | Bin 140 -> 2902 bytes
 3d_armor/textures/3d_armor_inv_helmet_wood.png     | Bin 140 -> 2925 bytes
 3d_armor/textures/3d_armor_inv_leggings_admin.png  | Bin 140 -> 2947 bytes
 3d_armor/textures/3d_armor_inv_leggings_bronze.png | Bin 155 -> 2924 bytes
 3d_armor/textures/3d_armor_inv_leggings_cactus.png | Bin 184 -> 3038 bytes
 .../textures/3d_armor_inv_leggings_crystal.png     | Bin 233 -> 2943 bytes
 .../textures/3d_armor_inv_leggings_diamond.png     | Bin 155 -> 2953 bytes
 3d_armor/textures/3d_armor_inv_leggings_gold.png   | Bin 155 -> 2920 bytes
 .../textures/3d_armor_inv_leggings_mithril.png     | Bin 155 -> 2923 bytes
 3d_armor/textures/3d_armor_inv_leggings_steel.png  | Bin 155 -> 2911 bytes
 3d_armor/textures/3d_armor_inv_leggings_wood.png   | Bin 155 -> 3032 bytes
 3d_armor/textures/3d_armor_leggings_admin.png      | Bin 351 -> 3021 bytes
 .../textures/3d_armor_leggings_admin_preview.png   | Bin 1340 -> 187 bytes
 3d_armor/textures/3d_armor_leggings_bronze.png     | Bin 335 -> 2998 bytes
 .../textures/3d_armor_leggings_bronze_preview.png  | Bin 1389 -> 211 bytes
 3d_armor/textures/3d_armor_leggings_cactus.png     | Bin 424 -> 3233 bytes
 .../textures/3d_armor_leggings_cactus_preview.png  | Bin 1340 -> 317 bytes
 3d_armor/textures/3d_armor_leggings_crystal.png    | Bin 835 -> 3018 bytes
 .../textures/3d_armor_leggings_crystal_preview.png | Bin 1917 -> 184 bytes
 3d_armor/textures/3d_armor_leggings_diamond.png    | Bin 306 -> 3019 bytes
 .../textures/3d_armor_leggings_diamond_preview.png | Bin 1388 -> 183 bytes
 3d_armor/textures/3d_armor_leggings_gold.png       | Bin 298 -> 2992 bytes
 .../textures/3d_armor_leggings_gold_preview.png    | Bin 1341 -> 211 bytes
 3d_armor/textures/3d_armor_leggings_mithril.png    | Bin 497 -> 2998 bytes
 .../textures/3d_armor_leggings_mithril_preview.png | Bin 1380 -> 213 bytes
 3d_armor/textures/3d_armor_leggings_steel.png      | Bin 331 -> 2983 bytes
 .../textures/3d_armor_leggings_steel_preview.png   | Bin 1387 -> 200 bytes
 3d_armor/textures/3d_armor_leggings_wood.png       | Bin 285 -> 3081 bytes
 .../textures/3d_armor_leggings_wood_preview.png    | Bin 1399 -> 262 bytes
 3d_armor/textures/character_preview.png            | Bin 907 -> 215 bytes
 3d_armor/textures/inventory_plus_armor.png         | Bin 544 -> 3267 bytes
 3d_armor/textures/preview_index.txt                |  44 ++
 3d_armor_stand/LICENSE.txt                         |  17 +-
 3d_armor_stand/init.lua                            | 104 +++--
 3d_armor_stand/models/3d_armor_stand.obj           | 445 ++++++++++++---------
 3d_armor_stand/models/3d_armor_stand.png           | Bin 0 -> 1628 bytes
 3d_armor_stand/models/3d_armor_stand_locked.png    | Bin 0 -> 1992 bytes
 LICENSE.md                                         |   2 +-
 README.md                                          |   2 +-
 .../textures/hazmat_suit_suit_hazmat_preview.png   | Bin 1005 -> 550 bytes
 hazmat_suit/textures/preview_index.txt             |   1 +
 preview_gen.py                                     |  81 ++++
 shields/LICENSE.txt                                |   4 +-
 shields/init.lua                                   |   9 +-
 shields/textures/preview_index.txt                 |  11 +
 shields/textures/shields_inv_shield_admin.png      | Bin 461 -> 2972 bytes
 shields/textures/shields_inv_shield_bronze.png     | Bin 490 -> 2991 bytes
 shields/textures/shields_inv_shield_cactus.png     | Bin 318 -> 3135 bytes
 shields/textures/shields_inv_shield_crystal.png    | Bin 662 -> 2964 bytes
 shields/textures/shields_inv_shield_diamond.png    | Bin 477 -> 2964 bytes
 .../shields_inv_shield_enhanced_cactus.png         | Bin 322 -> 3069 bytes
 .../textures/shields_inv_shield_enhanced_wood.png  | Bin 583 -> 3075 bytes
 shields/textures/shields_inv_shield_gold.png       | Bin 449 -> 2980 bytes
 shields/textures/shields_inv_shield_mithril.png    | Bin 526 -> 2990 bytes
 shields/textures/shields_inv_shield_steel.png      | Bin 546 -> 2964 bytes
 shields/textures/shields_inv_shield_wood.png       | Bin 529 -> 3046 bytes
 shields/textures/shields_shield_admin.png          | Bin 423 -> 3022 bytes
 shields/textures/shields_shield_admin_preview.png  | Bin 609 -> 298 bytes
 shields/textures/shields_shield_bronze.png         | Bin 502 -> 3035 bytes
 shields/textures/shields_shield_bronze_preview.png | Bin 1494 -> 312 bytes
 shields/textures/shields_shield_cactus.png         | Bin 325 -> 3190 bytes
 shields/textures/shields_shield_cactus_preview.png | Bin 536 -> 462 bytes
 shields/textures/shields_shield_crystal.png        | Bin 622 -> 3011 bytes
 .../textures/shields_shield_crystal_preview.png    | Bin 1791 -> 283 bytes
 shields/textures/shields_shield_diamond.png        | Bin 489 -> 3009 bytes
 .../textures/shields_shield_diamond_preview.png    | Bin 1480 -> 289 bytes
 .../textures/shields_shield_enhanced_cactus.png    | Bin 330 -> 3126 bytes
 .../shields_shield_enhanced_cactus_preview.png     | Bin 530 -> 405 bytes
 shields/textures/shields_shield_enhanced_wood.png  | Bin 597 -> 3126 bytes
 .../shields_shield_enhanced_wood_preview.png       | Bin 787 -> 409 bytes
 shields/textures/shields_shield_gold.png           | Bin 462 -> 3024 bytes
 shields/textures/shields_shield_gold_preview.png   | Bin 1454 -> 300 bytes
 shields/textures/shields_shield_mithril.png        | Bin 489 -> 3034 bytes
 .../textures/shields_shield_mithril_preview.png    | Bin 1480 -> 312 bytes
 shields/textures/shields_shield_steel.png          | Bin 561 -> 3009 bytes
 shields/textures/shields_shield_steel_preview.png  | Bin 1545 -> 284 bytes
 shields/textures/shields_shield_wood.png           | Bin 555 -> 3095 bytes
 shields/textures/shields_shield_wood_preview.png   | Bin 2055 -> 373 bytes
 technic_armor/textures/preview_index.txt           |  41 ++
 .../textures/technic_armor_boots_brass_preview.png | Bin 309 -> 352 bytes
 .../technic_armor_boots_carbon_preview.png         | Bin 239 -> 213 bytes
 .../textures/technic_armor_boots_cast_preview.png  | Bin 309 -> 337 bytes
 .../textures/technic_armor_boots_lead_preview.png  | Bin 423 -> 297 bytes
 .../technic_armor_boots_silver_preview.png         | Bin 304 -> 305 bytes
 .../technic_armor_boots_stainless_preview.png      | Bin 2608 -> 326 bytes
 .../textures/technic_armor_boots_tin_preview.png   | Bin 304 -> 354 bytes
 .../technic_armor_chestplate_brass_preview.png     | Bin 528 -> 582 bytes
 .../technic_armor_chestplate_carbon_preview.png    | Bin 526 -> 482 bytes
 .../technic_armor_chestplate_cast_preview.png      | Bin 528 -> 555 bytes
 .../technic_armor_chestplate_lead_preview.png      | Bin 936 -> 578 bytes
 .../technic_armor_chestplate_silver_preview.png    | Bin 521 -> 445 bytes
 .../technic_armor_chestplate_stainless_preview.png | Bin 4394 -> 554 bytes
 .../technic_armor_chestplate_tin_preview.png       | Bin 512 -> 547 bytes
 .../technic_armor_helmet_brass_preview.png         | Bin 347 -> 242 bytes
 .../technic_armor_helmet_carbon_preview.png        | Bin 280 -> 176 bytes
 .../textures/technic_armor_helmet_cast_preview.png | Bin 347 -> 237 bytes
 .../textures/technic_armor_helmet_lead_preview.png | Bin 430 -> 197 bytes
 .../technic_armor_helmet_silver_preview.png        | Bin 346 -> 210 bytes
 .../technic_armor_helmet_stainless_preview.png     | Bin 2109 -> 218 bytes
 .../textures/technic_armor_helmet_tin_preview.png  | Bin 347 -> 236 bytes
 .../technic_armor_leggings_brass_preview.png       | Bin 359 -> 368 bytes
 .../technic_armor_leggings_carbon_preview.png      | Bin 265 -> 219 bytes
 .../technic_armor_leggings_cast_preview.png        | Bin 359 -> 351 bytes
 .../technic_armor_leggings_lead_preview.png        | Bin 535 -> 362 bytes
 .../technic_armor_leggings_silver_preview.png      | Bin 323 -> 308 bytes
 .../technic_armor_leggings_stainless_preview.png   | Bin 2945 -> 348 bytes
 .../technic_armor_leggings_tin_preview.png         | Bin 359 -> 359 bytes
 .../technic_armor_shield_brass_preview.png         | Bin 735 -> 632 bytes
 .../technic_armor_shield_carbon_preview.png        | Bin 773 -> 595 bytes
 .../textures/technic_armor_shield_cast_preview.png | Bin 751 -> 620 bytes
 .../textures/technic_armor_shield_lead_preview.png | Bin 1146 -> 729 bytes
 .../technic_armor_shield_silver_preview.png        | Bin 784 -> 586 bytes
 .../technic_armor_shield_stainless_preview.png     | Bin 787 -> 638 bytes
 .../textures/technic_armor_shield_tin_preview.png  | Bin 729 -> 615 bytes
 198 files changed, 690 insertions(+), 296 deletions(-)

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



More information about the Pkg-games-commits mailing list