Merge remote-tracking branch 'upstream/master' into ups

2024-08-14 22:54:19 +03:00
parent cbd6a8cff2 98b26ff951
commit 1f1d61dc82
76 changed files with 727 additions and 135 deletions
--- a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/equipped-EYES.png
+++ b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/equipped-EYES.png
--- a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/icon.png
+++ b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/icon.png
--- a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-left.png
+++ b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-left.png
--- a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-right.png
+++ b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-right.png
--- a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Maid by omsoyk Discord",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
--- a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/equipped-HELMET.png
+++ b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/equipped-HELMET.png
--- a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/icon.png
+++ b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/icon.png
--- a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-left.png
+++ b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-left.png
--- a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-right.png
+++ b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-right.png
--- a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
--- a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/equipped-HELMET.png
+++ b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/equipped-HELMET.png
--- a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/icon.png
+++ b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/icon.png
--- a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-left.png
+++ b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-left.png
--- a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-right.png
+++ b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-right.png
--- a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
--- a/Resources/Textures/White/Clothing/Head/maidhat.rsi/equipped-HELMET.png
+++ b/Resources/Textures/White/Clothing/Head/maidhat.rsi/equipped-HELMET.png
--- a/Resources/Textures/White/Clothing/Head/maidhat.rsi/icon.png
+++ b/Resources/Textures/White/Clothing/Head/maidhat.rsi/icon.png
--- a/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-left.png
+++ b/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-left.png
--- a/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-right.png
+++ b/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-right.png
--- a/Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}