Merge branch 'master' into nalc-1.2

3d_armor/LICENSE.txt

@@ -1,26 +1,9 @@
 [mod] 3d Armor [3d_armor]
 =========================
 
-License Source Code
--------------------
+License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
 
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
+License Textures: Copyright (C) 2017 davidthecreator - CC-BY-SA 3.0
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
+https://github.com/daviddoesminetest/3d-armors-new-textures
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-License Textures
-----------------
-
-Copyright (C) 2017-2019 davidthecreator - CC-BY-SA 3.0

3d_armor_ip/LICENSE.txt

@@ -1,18 +1,5 @@
 [mod] 3d Armor integration to inventory plus [3d_armor_ip]
 ==========================================================
 
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
+License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

3d_armor_sfinv/LICENSE.txt

@@ -1,18 +1,5 @@
 [mod] 3d Armor sfinv integration [3d_armor_sfinv]
 =================================================
 
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
+License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

3d_armor_stand/LICENSE.txt

@@ -1,43 +1,22 @@
 [mod] 3d Armor Stand [3d_armor_stand]
 =====================================
 
-License Source Code
--------------------
+License Source Code: (C) 2016-2018 Stuart Jones - LGPL v2.1
 
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Lecense Models
---------------
-
-Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0
+Lecense Models: (C) 2016-2018 Stuart Jones - CC BY-SA 3.0
 
 UV model mapping by tobyplowy(aka toby109tt)
 
-License Textures
-----------------
+License Textures:
 
 3d_armor_stand.png
 3d_armor_stand_locked.png
 
-Copyright (C) 2017-2019 tobyplowy - CC BY-SA 3.0
+(C) 2017 tobyplowy - CC BY-SA 3.0
 
 3d_armor_stand_feet.png
 3d_armor_stand_head.png
 3d_armor_stand_legs.png
 3d_armor_stand_torso.png
 
-Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0
+(C) 2016-2017 Stuart Jones - CC BY-SA 3.0

3d_armor_ui/LICENSE.txt

@@ -1,18 +1,5 @@
 [mod] 3d Armor integration to unified inventory [3d_armor_ui]
 =============================================================
 
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
+License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

shields/LICENSE.txt

@@ -1,26 +1,8 @@
 [mod] Shields [shields]
 =======================
 
-License Source Code
--------------------
+License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1
 
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
+License Textures: Copyright (C) 2017-2018 davidthecreator - CC-BY-SA 3.0
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-License Textures
-----------------
-
-Copyright (C) 2017-2019 davidthecreator - CC-BY-SA 3.0
+https://github.com/daviddoesminetest/3d-armors-new-textures

wieldview/LICENSE.txt

@@ -1,18 +1,5 @@
 [mod] visible wielded items [wieldview]
 =======================================
 
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
+License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.