bates64

.github/FUNDING.yml

@@ -1 +1 @@
-github: nanaian
+github: bates64

license

@@ -1,4 +1,4 @@
-Copyright (C) 2022 by Alex Bates <alex@nanaian.town>
+Copyright (C) 2024 by Alex Bates <alex@bates64.com>
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
 

mamar-wasm-bridge/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mamar-wasm-bridge"
 version = "0.1.0"
-authors = ["Alex Bates <alex@nanaian.town>"]
+authors = ["Alex Bates <alex@bates64.com>"]
 edition = "2018"
 
 [lib]

mamar-web/package.json

@@ -2,8 +2,8 @@
   "name": "mamar-web",
   "version": "1.0.0",
   "description": "Paper Mario music editor",
-  "repository": "https://github.com/nanaian/mamar",
-  "author": "Alex Bates <alex@nanaian.town>",
+  "repository": "https://github.com/bates64/mamar",
+  "author": "Alex Bates <alex@bates64.com>",
   "private": true,
   "scripts": {
     "start": "parcel src/index.html src/app/index.html",
@@ -21,7 +21,7 @@
     "idb-keyval": "^6.2.0",
     "immer": "^9.0.15",
     "mamar-wasm-bridge": "*",
-    "mupen64plus-web": "nanaian/mupen64plus-web#mamar",
+    "mupen64plus-web": "bates64/mupen64plus-web#mamar",
     "patches": "*",
     "pm64-typegen": "*",
     "react": "^18.2.0",

mamar-web/src/index.html

@@ -8,7 +8,7 @@
 
         <meta name="twitter:card" property="twitter:card" content="social-banner.png" />
         <meta name="og:image" property="og:image" content="social-banner.png" />
-        <meta name="twitter:creator" property="twitter:creator" content="@nanaian_" />
+        <meta name="twitter:creator" property="twitter:creator" content="@bates64a" />
 
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta name="theme-color" content="#ea7aa1" />
@@ -24,11 +24,11 @@ <h1>
                 Mamar
             </h1>
             <span class="author">
-                by <a class="link" href="//nanaian.town">alex</a>
+                by <a class="link" href="//bates64.com">alex</a>
             </span>
             <div class="right">
-                <a href="https://github.com/nanaian/mamar">
-                    <svg aria-label="Github" viewBox="0 0 16 16" width="24" height="24" fill="currentColor" style="display:inline-block;user-select:none;vertical-align:text-bottom;overflow:visible"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path></svg>
+                <a href="https://github.com/bates64/mamar">
+                    <svg aria-label="GitHub" viewBox="0 0 16 16" width="24" height="24" fill="currentColor" style="display:inline-block;user-select:none;vertical-align:text-bottom;overflow:visible"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path></svg>
                 </a>
                 <a class="button cta" href="/app">
                     Open Mamar
@@ -86,8 +86,7 @@ <h2>Contributing</h2>
                     Mamar is open-source and contributions are welcome!
                 </p>
                 <p>
-                    The source code is available <a href="https://github.com/nanaian/mamar">on GitHub</a>.
-                    If you're unable to contribute code but still want to support me, consider <a href="https://github.com/sponsors/nanaian">donating</a>!
+                    The source code is available <a href="https://github.com/bates64/mamar">on GitHub</a>.
                 </p>
             </section>
         </main>

readme.md

@@ -1,6 +1,6 @@
 [![Mamar](mamar-web/src/logotype.svg)](https://mamar.nanaian.town)
 
-[![](https://img.shields.io/github/actions/workflow/status/nanaian/mamar/test.yml?branch=main)](https://github.com/nanaian/mamar/actions)
+[![](https://img.shields.io/github/actions/workflow/status/nanaian/mamar/test.yml?branch=main)](https://github.com/bates64/mamar/actions)
 [![](https://img.shields.io/discord/279322074412089344?color=%237289DA&logo=discord&logoColor=ffffff)](https://discord.gg/qWSxcTjktv)
 
 Paper Mario music editor.
@@ -14,7 +14,7 @@ Paper Mario music editor.
 Architecture
 ============
 
-Mamar is a web app comprised of [a React frontend](/mamar-web), [Rust](/pm64) [supporting](/mamar-wasm-bridge) [libraries](/pm64-typegen) compiled to WebAssembly, [C patches](/patches) over [the Paper Mario decompilation](https://github.com/pmret/papermario), and [a custom build of mupen64plus-web](https://github.com/nanaian/mupen64plus-web/tree/mamar). The whole thing is client-side only i.e. you can serve it with a simple static file server (the live site uses [Vercel](https://vercel.com/) for deployments).
+Mamar is a web app comprised of [a React frontend](/mamar-web), [Rust](/pm64) [supporting](/mamar-wasm-bridge) [libraries](/pm64-typegen) compiled to WebAssembly, [C patches](/patches) over [the Paper Mario decompilation](https://github.com/pmret/papermario), and [a custom build of mupen64plus-web](https://github.com/bates64/mupen64plus-web/tree/mamar). The whole thing is client-side only i.e. you can serve it with a simple static file server (the live site uses [Vercel](https://vercel.com/) for deployments).
 
 Why are some parts Rust? Mamar used to be a desktop application written entirely in Rust! It's also a more suitable language for the kind of encoding/decoding of binary data that Mamar needs to do.
 
@@ -87,7 +87,7 @@ For developing, `yarn start` in `mamar-web` will start a dev server at `localhos
 Working on `mupen64plus-web`
 ----------------------------
 
-- In [mupen64plus-web](https://github.com/nanaian/mupen64plus-web):
+- In [mupen64plus-web](https://github.com/bates64/mupen64plus-web):
     1. Switch the Mamar branch: `git checkout mamar`
     2. Run `yarn link`
     3. Setup emscripten 3.1.8

yarn.lock

@@ -5942,9 +5942,9 @@ msgpackr@^1.5.4:
   optionalDependencies:
     msgpackr-extract "^2.0.2"
 
-mupen64plus-web@nanaian/mupen64plus-web#mamar:
+mupen64plus-web@bates64/mupen64plus-web#mamar:
   version "1.4.0"
-  resolved "https://codeload.github.com/nanaian/mupen64plus-web/tar.gz/eb69b65f36c9d90213a09c88f4680ab94264a1e4"
+  resolved "https://codeload.github.com/bates64/mupen64plus-web/tar.gz/eb69b65f36c9d90213a09c88f4680ab94264a1e4"
 
 natural-compare@^1.4.0:
   version "1.4.0"