From 7fdc20684b020ebbf848485ba4f0c4d872bb01a8 Mon Sep 17 00:00:00 2001 From: TheScarFr Date: Sat, 2 Nov 2024 17:15:57 +0100 Subject: [PATCH 1/2] Bracelet Clothing Add the "Bracelet" Clothing Item by default in the wardrobe Co-authored-by: Jrius Co-authored-by: Ehren Co-authored-by: dgelessus Co-authored-by: Riccardo Salerano Co-authored-by: Salvo Ludus --- compiled/dat/ACAEnglish.loc | 3 +++ compiled/dat/ACAFrench.loc | 3 +++ compiled/dat/ACAGerman.loc | 3 +++ compiled/dat/ACAItalian.loc | 3 +++ compiled/dat/ACASpanish.loc | 3 +++ compiled/dat/GlobalClothing_District_FemaleBracelets.prp | 3 +++ compiled/dat/GlobalClothing_District_MaleBracelets.prp | 3 +++ sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.png | 3 +++ sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.xcf | 3 +++ sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.png | 3 +++ sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.xcf | 3 +++ sources/avatar/clothing_bracelets/bracelet_export_mesh.blend | 3 +++ sources/avatar/clothing_bracelets/bracelet_export_mesh_f.blend | 3 +++ 13 files changed, 39 insertions(+) create mode 100644 compiled/dat/GlobalClothing_District_FemaleBracelets.prp create mode 100644 compiled/dat/GlobalClothing_District_MaleBracelets.prp create mode 100644 sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.png create mode 100644 sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.xcf create mode 100644 sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.png create mode 100644 sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.xcf create mode 100644 sources/avatar/clothing_bracelets/bracelet_export_mesh.blend create mode 100644 sources/avatar/clothing_bracelets/bracelet_export_mesh_f.blend diff --git a/compiled/dat/ACAEnglish.loc b/compiled/dat/ACAEnglish.loc index 387622e3..170a2fb5 100644 --- a/compiled/dat/ACAEnglish.loc +++ b/compiled/dat/ACAEnglish.loc @@ -29,6 +29,9 @@ Boots + + Bracelet + Canvas Gloves diff --git a/compiled/dat/ACAFrench.loc b/compiled/dat/ACAFrench.loc index 73460d10..75d492eb 100644 --- a/compiled/dat/ACAFrench.loc +++ b/compiled/dat/ACAFrench.loc @@ -29,6 +29,9 @@ Bottes + + Bracelet + Gants en laine diff --git a/compiled/dat/ACAGerman.loc b/compiled/dat/ACAGerman.loc index c45883bf..47bd4c0e 100644 --- a/compiled/dat/ACAGerman.loc +++ b/compiled/dat/ACAGerman.loc @@ -29,6 +29,9 @@ Stiefel + + Armband + Stoffhandschuhe diff --git a/compiled/dat/ACAItalian.loc b/compiled/dat/ACAItalian.loc index 55988e7b..52231999 100644 --- a/compiled/dat/ACAItalian.loc +++ b/compiled/dat/ACAItalian.loc @@ -28,6 +28,9 @@ Scarpe + + Braccialetto + Guanti di tela diff --git a/compiled/dat/ACASpanish.loc b/compiled/dat/ACASpanish.loc index 97c17011..f4f50c2e 100644 --- a/compiled/dat/ACASpanish.loc +++ b/compiled/dat/ACASpanish.loc @@ -28,6 +28,9 @@ Botas + + Brazalete + Guantes tela diff --git a/compiled/dat/GlobalClothing_District_FemaleBracelets.prp b/compiled/dat/GlobalClothing_District_FemaleBracelets.prp new file mode 100644 index 00000000..aae33675 --- /dev/null +++ b/compiled/dat/GlobalClothing_District_FemaleBracelets.prp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48c2ce276bee307ed1a8a3b7f62ed6772c95d7259bd96027c18f3a029f0aa268 +size 246211 diff --git a/compiled/dat/GlobalClothing_District_MaleBracelets.prp b/compiled/dat/GlobalClothing_District_MaleBracelets.prp new file mode 100644 index 00000000..30113c66 --- /dev/null +++ b/compiled/dat/GlobalClothing_District_MaleBracelets.prp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66dcc83d8ebdb822a3b06a75abc6f6db7e138c05e1911e404e1a65719ff1b497 +size 197841 diff --git a/sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.png b/sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.png new file mode 100644 index 00000000..e8bc9036 --- /dev/null +++ b/sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73d271e1de2dbb42c3f80d16ce33547a6a807f3a5d9a3c586d299f30a2484ccd +size 8114 diff --git a/sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.xcf b/sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.xcf new file mode 100644 index 00000000..1b551736 --- /dev/null +++ b/sources/avatar/clothing_bracelets/Icon_UHand_Bracelet.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:136f8907a846f9b8a7481c4611d1b8fe4459f2d7a749c6f3f7efa5ee0c0cd5b5 +size 15864 diff --git a/sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.png b/sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.png new file mode 100644 index 00000000..d3c2e829 --- /dev/null +++ b/sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cc23278cd8c225d99d1462fe2ca28b037b8fd744db65fcdeda4e7cc7f0b507b +size 5251 diff --git a/sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.xcf b/sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.xcf new file mode 100644 index 00000000..1684874b --- /dev/null +++ b/sources/avatar/clothing_bracelets/UHand_Bracelet_tint1.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3e70543a30807aaf8170ccb6e79aca01b488deaeacacd9803042713894c1fbb +size 12992 diff --git a/sources/avatar/clothing_bracelets/bracelet_export_mesh.blend b/sources/avatar/clothing_bracelets/bracelet_export_mesh.blend new file mode 100644 index 00000000..174e4a67 --- /dev/null +++ b/sources/avatar/clothing_bracelets/bracelet_export_mesh.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c8e554cda66ee1b6e8a03fb253f70be7259c62906aebc517beabbda49f01586 +size 449116 diff --git a/sources/avatar/clothing_bracelets/bracelet_export_mesh_f.blend b/sources/avatar/clothing_bracelets/bracelet_export_mesh_f.blend new file mode 100644 index 00000000..1a94224a --- /dev/null +++ b/sources/avatar/clothing_bracelets/bracelet_export_mesh_f.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79a6d0b15ef74eaa2f391ab86a0322cf76b8a873c67140f2f1286ede0d65d837 +size 459280 From f2d191373804e72a2fac75b916f68c6717c566e2 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 4 Nov 2024 19:09:51 -0500 Subject: [PATCH 2/2] Fix bracelet Spanish translation. --- compiled/dat/ACASpanish.loc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiled/dat/ACASpanish.loc b/compiled/dat/ACASpanish.loc index f4f50c2e..d971078a 100644 --- a/compiled/dat/ACASpanish.loc +++ b/compiled/dat/ACASpanish.loc @@ -29,7 +29,7 @@ Botas - Brazalete + Pulsera Guantes tela