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/shields/textures/preview_index.txt
+++ b/shields/textures/preview_index.txt
@ -8,4 +8,5 @@ shields/textures/shields_shield_gold.png:shield
 shields/textures/shields_shield_diamond.png:shield
 shields/textures/shields_shield_mithril.png:shield
 shields/textures/shields_shield_crystal.png:shield
+shields/textures/shields_shield_nether.png:shield
 shields/textures/shields_shield_admin.png:shield
--- a/shields/textures/shields_inv_shield_nether.png
+++ b/shields/textures/shields_inv_shield_nether.png
--- a/shields/textures/shields_shield_nether.png
+++ b/shields/textures/shields_shield_nether.png
--- a/shields/textures/shields_shield_nether_preview.png
+++ b/shields/textures/shields_shield_nether_preview.png