Merge branch 'main' into main

ordinals-wallet · Jul 24, 2024 · 14a072e · 14a072e
2 parents 4eee8cc + 3d09406
commit 14a072e
Show file tree

Hide file tree

Showing 448 changed files with 12,334,753 additions and 396 deletions.
diff --git a/Merlin-Hat/.gitkeep b/Merlin-Hat/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/Merlin-Hat/inscriptions.json b/Merlin-Hat/inscriptions.json
diff --git a/Merlin-Hat/meta.json b/Merlin-Hat/meta.json
@@ -0,0 +1 @@
+{"name":"Merlin Hat","slug":"Merlin-Hat","supply":"42000","description":"The first BRC-420 meme for Merlin Chain","twitter_link":"https://twitter.com/BitmapTech","discord_link":"https://discord.com/invite/merlinchain","website_link":"https://testnet.merlinchain.io/bridge","inscription_icon":"b91084dd15d7df4e15fe83f866c2421686c53105ceb81ce9acf034526c63b0c4i0"}
diff --git a/README.md b/README.md
@@ -43,24 +43,36 @@ Artists can assign unqiue traits to ordinals with `attributes`
   ...
 ]
 ```
-
 Your inscriptions.json file will look like this:
 
 ```
 [
   {
-    "id": "af0b19432a676551223e300e7197348b7c225cb7b31d0d7c6e246e382cbf6f81i0",
+    "id": "c387a2656ef973a55df57edd3ac4b26b09865cc3fcb21cfaa4921ead1363f53ai0",
     "meta": {
-      "name": "Planetary Ordinal #11",
+      "name": "Bitcoin Frog #2989",
       "attributes": [
         {
           "trait_type": "Background",
-          "value": "Sun sun",
+          "value": "Black",
+        },
+        {
+          "trait_type": "Body",
+          "value": "Tron",
+        },
+        {
+          "trait_type": "Clothing",
+          "value": "Green Hoodie",
+        },
+        {
+          "trait_type": "Mouth",
+          "value": "Cigar",
         },
         {
-          "trait_type": "Holes",
-          "value": "rose blossom",
+          "trait_type": "Eyes",
+          "value": "Visor",
         }
+
       ]
     }
   }

diff --git a/collections/-BRC 420.00/.gitkeep b/collections/-BRC 420.00/.gitkeep
diff --git a/collections/0n1y-0ne-pixe1-ri0t/.gitkeep b/collections/0n1y-0ne-pixe1-ri0t/.gitkeep
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"name":"Merlin Hat","slug":"Merlin-Hat","supply":"42000","description":"The first BRC-420 meme for Merlin Chain","twitter_link":"https://twitter.com/BitmapTech","discord_link":"https://discord.com/invite/merlinchain","website_link":"https://testnet.merlinchain.io/bridge","inscription_icon":"b91084dd15d7df4e15fe83f866c2421686c53105ceb81ce9acf034526c63b0c4i0"}