Merge branch 'master' into contentdb

2025-06-28 14:16:01 +02:00 · 2020-02-10 07:12:23 +01:00
parent 04b43a5969 ada930c099
commit 436809f8fa
22 changed files with 101 additions and 16 deletions
--- a/textures/character.png
+++ b/textures/character.png
--- a/textures/character_preview.png
+++ b/textures/character_preview.png
--- a/textures/inventory_plus_skins.png
+++ b/textures/inventory_plus_skins.png
--- a/textures/readme.txt
+++ b/textures/readme.txt
@ -7,6 +7,7 @@ One or multiple private skins for player "nick":
 	player_[nick].png or
 	player_[nick]_[number-or-name].png

-Preview files for public and private skins:
+Preview files for public and private skins.
+Optional, overrides the generated preview
 	character_*_preview.png or
 	player_*_*_preview.png
--- a/textures/skindb_mask_chest.png
+++ b/textures/skindb_mask_chest.png
--- a/textures/skindb_mask_head.png
+++ b/textures/skindb_mask_head.png
--- a/textures/skindb_mask_rarm.png
+++ b/textures/skindb_mask_rarm.png
--- a/textures/skindb_mask_rleg.png
+++ b/textures/skindb_mask_rleg.png
--- a/textures/skindb_transform.png
+++ b/textures/skindb_transform.png
--- a/textures/skins_button.png
+++ b/textures/skins_button.png
--- a/textures/ui_misc_form.png
+++ b/textures/ui_misc_form.png