[minetest-mod-3d-armor] 02/07: New upstream version 0.4.6
Julien Puydt
julien.puydt at laposte.net
Wed Jan 11 22:26:49 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 9c0fbaf572b21253ee7e2f5edaf6bc87814b4fc1
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Wed Jan 11 21:23:15 2017 +0100
New upstream version 0.4.6
---
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(-)
diff --git a/3d_armor/LICENSE.txt b/3d_armor/LICENSE.txt
new file mode 100644
index 0000000..c0f9da9
--- /dev/null
+++ b/3d_armor/LICENSE.txt
@@ -0,0 +1,7 @@
+[mod] 3d Armor [3d_armor]
+=========================
+
+License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
+
+License Textures: Copyright (C) 2013-2017 Ryan Jones - CC-BY-SA 3.0
+
diff --git a/3d_armor/armor.lua b/3d_armor/armor.lua
index 2bd865d..05b8d24 100644
--- a/3d_armor/armor.lua
+++ b/3d_armor/armor.lua
@@ -64,7 +64,7 @@ armor = {
.."listring[current_player;craft]",
textures = {},
default_skin = "character",
- version = "0.4.5",
+ version = "0.4.6",
}
if minetest.get_modpath("inventory_plus") then
@@ -397,7 +397,7 @@ minetest.register_on_joinplayer(function(player)
allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
return count
end,
- })
+ }, name)
if inv_mod == "inventory_plus" then
inventory_plus.register_button(player,"armor", "Armor")
end
@@ -626,7 +626,18 @@ end)
minetest.register_chatcommand("kill", {
params = "<name>",
description = "Kills player instantly",
+ privs = {ban=true},
func = function(name, param)
+ local player = minetest.get_player_by_name(param)
+ if player then
+ player:set_hp(0)
+ end
+ end,
+})
+
+minetest.register_chatcommand("killme", {
+ description = "Kill yourself instantly",
+ func = function(name)
local player = minetest.get_player_by_name(name)
if player then
player:set_hp(-1001)
diff --git a/3d_armor/models/3d_armor_character.b3d b/3d_armor/models/3d_armor_character.b3d
index a24cb65..7c27cae 100644
Binary files a/3d_armor/models/3d_armor_character.b3d and b/3d_armor/models/3d_armor_character.b3d differ
diff --git a/3d_armor/models/3d_armor_character.blend b/3d_armor/models/3d_armor_character.blend
index d2031ce..f61e222 100644
Binary files a/3d_armor/models/3d_armor_character.blend and b/3d_armor/models/3d_armor_character.blend differ
diff --git a/3d_armor_stand/LICENSE.txt b/3d_armor_stand/LICENSE.txt
index 5c8246a..fe6dbd8 100644
--- a/3d_armor_stand/LICENSE.txt
+++ b/3d_armor_stand/LICENSE.txt
@@ -1,7 +1,7 @@
[mod] 3d Armor Stand [3d_armor_stand]
=====================================
-License Source Code: LGPL v2.1
+License Source Code: (C) 2016-2017 Stuart Jones - LGPL v2.1
-Lecense Media: CC BY-SA 3.0
+Lecense Media: (C) 2016-2017 Stuart Jones - CC BY-SA 3.0
diff --git a/LICENSE.md b/LICENSE.md
index d383270..fd06688 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,11 +1,9 @@
3D Armor - Visible Player Armor
===============================
-Default Item Textures (C) Cisoun - WTFPL
+License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1
-Armor Textures: Copyright (C) 2013 Ryan Jones - CC-BY-SA
-
-Source Code: Copyright (C) 2013 Stuart Jones - LGPL
+Armor Textures: Copyright (C) 2013-2017 Ryan Jones - CC-BY-SA 3.0
Special credit to Jordach and MirceaKitsune for providing the default 3d character model.
diff --git a/README.md b/README.md
index f74ce04..aac16d3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Modpack - 3d Armor [0.4.5]
+Modpack - 3d Armor [0.4.6]
==========================
### Table of Contents
diff --git a/hazmat_suit/LICENSE.txt b/hazmat_suit/LICENSE.txt
new file mode 100644
index 0000000..d98ddf4
--- /dev/null
+++ b/hazmat_suit/LICENSE.txt
@@ -0,0 +1,7 @@
+[mod] Hazmat Suit [hazmat_suit]
+===============================
+
+License Source Code: Copyright (C) 2015-2017 Stuart Jones - LGPL v2.1
+
+License Textures: HybridDog and numberZero - WTFPL
+
diff --git a/hazmat_suit/README.txt b/hazmat_suit/README.txt
index eb61e26..73c7ecc 100644
--- a/hazmat_suit/README.txt
+++ b/hazmat_suit/README.txt
@@ -1,5 +1,5 @@
[mod] Hazmat Suit [hazmat_suit]
-===================================
+===============================
Adds hazmat suit to 3d_armor. It protects rather well from fire (if enabled in configuration) and radiation, and it has built-in oxygen supply.
Requires technic mod.
@@ -7,4 +7,4 @@ Requires technic mod.
Depends: 3d_armor, technic
Source code by numZero
-Textures by HybridDog and numZero
+Textures by HybridDog and numberZero
diff --git a/shields/LICENSE.txt b/shields/LICENSE.txt
new file mode 100644
index 0000000..ea64f2c
--- /dev/null
+++ b/shields/LICENSE.txt
@@ -0,0 +1,6 @@
+[mod] Shields [shields]
+=======================
+
+License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1
+
+License Textures: Copyright (C) 2013-2017 Ryan Jones - CC-BY-SA 3.0
diff --git a/shields/README.txt b/shields/README.txt
index 3146bcb..d71626d 100644
--- a/shields/README.txt
+++ b/shields/README.txt
@@ -1,3 +1,6 @@
+[mod] Shields [shields]
+=======================
+
Adds shields to 3d_armor
Depends: 3d_armor
diff --git a/technic_armor/LICENSE.txt b/technic_armor/LICENSE.txt
new file mode 100644
index 0000000..f454a50
--- /dev/null
+++ b/technic_armor/LICENSE.txt
@@ -0,0 +1,7 @@
+[mod] Technic Armor [technic_armor]
+===================================
+
+License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1
+
+License Textures: poet.nohit and numberZero - WTFPL
+
diff --git a/technic_armor/README.txt b/technic_armor/README.txt
index 93038e9..76a88eb 100644
--- a/technic_armor/README.txt
+++ b/technic_armor/README.txt
@@ -6,4 +6,4 @@ Requires technic (technic_worldgen at least) mod.
Depends: 3d_armor, technic_worldgen
-Source code and textures by poet.nohit and numzero
+Textures by poet.nohit and numberZero
diff --git a/wieldview/LICENSE.txt b/wieldview/LICENSE.txt
new file mode 100644
index 0000000..4e8d524
--- /dev/null
+++ b/wieldview/LICENSE.txt
@@ -0,0 +1,5 @@
+[mod] visible wielded items [wieldview]
+=======================================
+
+License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1
+
--
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