Merge remote-tracking branch 'upstream/master'

2021-11-26 21:30:41 +01:00
parent 5845d3682d b6651fd396
commit 6757013da2
39 changed files with 251 additions and 1 deletions
--- a/3d_armor/textures/3d_armor_boots_nether.png
+++ b/3d_armor/textures/3d_armor_boots_nether.png
--- a/3d_armor/textures/3d_armor_boots_nether_preview.png
+++ b/3d_armor/textures/3d_armor_boots_nether_preview.png
--- a/3d_armor/textures/3d_armor_chestplate_nether.png
+++ b/3d_armor/textures/3d_armor_chestplate_nether.png
--- a/3d_armor/textures/3d_armor_chestplate_nether_preview.png
+++ b/3d_armor/textures/3d_armor_chestplate_nether_preview.png
--- a/3d_armor/textures/3d_armor_helmet_nether.png
+++ b/3d_armor/textures/3d_armor_helmet_nether.png
--- a/3d_armor/textures/3d_armor_helmet_nether_preview.png
+++ b/3d_armor/textures/3d_armor_helmet_nether_preview.png
--- a/3d_armor/textures/3d_armor_inv_boots_nether.png
+++ b/3d_armor/textures/3d_armor_inv_boots_nether.png
--- a/3d_armor/textures/3d_armor_inv_chestplate_nether.png
+++ b/3d_armor/textures/3d_armor_inv_chestplate_nether.png
--- a/3d_armor/textures/3d_armor_inv_helmet_nether.png
+++ b/3d_armor/textures/3d_armor_inv_helmet_nether.png
--- a/3d_armor/textures/3d_armor_inv_leggings_nether.png
+++ b/3d_armor/textures/3d_armor_inv_leggings_nether.png
--- a/3d_armor/textures/3d_armor_leggings_nether.png
+++ b/3d_armor/textures/3d_armor_leggings_nether.png
--- a/3d_armor/textures/3d_armor_leggings_nether_preview.png
+++ b/3d_armor/textures/3d_armor_leggings_nether_preview.png
--- a/3d_armor/textures/preview_index.txt
+++ b/3d_armor/textures/preview_index.txt
@ -38,6 +38,11 @@
 3d_armor/textures/3d_armor_leggings_crystal.png:legs
 3d_armor/textures/3d_armor_boots_crystal.png:feet

+3d_armor/textures/3d_armor_helmet_nether.png:head
+3d_armor/textures/3d_armor_chestplate_nether.png:torso
+3d_armor/textures/3d_armor_leggings_nether.png:legs
+3d_armor/textures/3d_armor_boots_nether.png:feet
+
 3d_armor/textures/3d_armor_helmet_admin.png:head
 3d_armor/textures/3d_armor_chestplate_admin.png:torso
 3d_armor/textures/3d_armor_leggings_admin.png:legs