Fix merge conflict

ROBOT-IS-CHILL · Oct 30, 2023 · 98c9ebb · 98c9ebb
2 parents 3a14156 + be50653
commit 98c9ebb
Show file tree

Hide file tree

Showing 2,139 changed files with 2,228 additions and 125 deletions.
diff --git a/data/custom/baba-extensions.json b/data/custom/baba-extensions.json
@@ -108,5 +108,41 @@
             "3"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "loot",
+        "sprite": "loot",
+        "color": [
+            "4",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_loot",
+        "sprite": "text_loot",
+        "color": [
+            "4",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_out",
+        "sprite": "text_out",
+        "color": [
+            "4",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "mblock2",
+        "sprite": "mblockold",
+        "color": [
+            "2",
+            "4"
+        ],
+        "tiling": "-1"
     }
 ]
diff --git a/data/custom/balts-additions.json b/data/custom/balts-additions.json
@@ -440,15 +440,6 @@
         ],
         "tiling": "-1"
     },
-    {
-        "name": "text_summun",
-        "sprite": "text_summun",
-        "color": [
-            "0",
-            "3"
-        ],
-        "tiling": "-1"
-    },
     {
         "name": "text_bibad",
         "sprite": "text_bibad",

diff --git a/data/custom/beta.json b/data/custom/beta.json
@@ -2,7 +2,7 @@
     {
        "name": "annibeta",
        "sprite": "annibeta",
-       "tiling": "2",
+       "tiling": "3",
        "color": [
           "6",
           "0"
@@ -11,7 +11,7 @@
     {
        "name": "bababeta",
        "sprite": "bababeta",
-       "tiling": "2",
+       "tiling": "3",
        "color": [
           "0",
           "3"
@@ -128,7 +128,7 @@
      {
          "name": "kekebeta",
          "sprite": "kekebeta",
-         "tiling": "2",
+         "tiling": "3",
          "color": [
             "2",
             "2"
@@ -155,7 +155,7 @@
       {
           "name": "mebeta",
           "sprite": "mebeta",
-          "tiling": "2",
+          "tiling": "3",
           "color": [
              "3",
              "1"
@@ -182,7 +182,7 @@
 	  {
          "name": "skullbeta",
          "sprite": "skullbeta",
-         "tiling": "2",
+         "tiling": "0",
          "color": [
             "2",
             "0"

diff --git a/data/custom/dizzyandy-sprites.json b/data/custom/dizzyandy-sprites.json
@@ -556,5 +556,41 @@
             "3"
         ],
         "tiling": "2"
+    },
+    {
+        "name": "banner",
+        "sprite": "banner",
+        "color": [
+            "5",
+            "3"
+        ],
+        "tiling": "1"
+    },
+    {
+        "name": "traitrai",
+        "sprite": "traitrai",
+        "color": [
+            "4",
+            "4"
+        ],
+        "tiling": "2"
+    },
+    {
+        "name": "special",
+        "sprite": "special",
+        "color": [
+            "0",
+            "3"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_special",
+        "sprite": "text_special",
+        "color": [
+            "0",
+            "3"
+        ],
+        "tiling": "-1"
     }
 ]