diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index e935710..0b57940 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -github: nanaian +github: bates64 diff --git a/license b/license index ac87f29..d8e70c7 100644 --- a/license +++ b/license @@ -1,4 +1,4 @@ -Copyright (C) 2022 by Alex Bates +Copyright (C) 2024 by Alex Bates Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. diff --git a/mamar-wasm-bridge/Cargo.toml b/mamar-wasm-bridge/Cargo.toml index 8ff59fb..89120a4 100644 --- a/mamar-wasm-bridge/Cargo.toml +++ b/mamar-wasm-bridge/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mamar-wasm-bridge" version = "0.1.0" -authors = ["Alex Bates "] +authors = ["Alex Bates "] edition = "2018" [lib] diff --git a/mamar-web/package.json b/mamar-web/package.json index d5083b6..e080e31 100644 --- a/mamar-web/package.json +++ b/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 ", + "repository": "https://github.com/bates64/mamar", + "author": "Alex Bates ", "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", diff --git a/mamar-web/src/index.html b/mamar-web/src/index.html index 91f8b34..abc0f0b 100644 --- a/mamar-web/src/index.html +++ b/mamar-web/src/index.html @@ -8,7 +8,7 @@ - + @@ -24,11 +24,11 @@

Mamar

- by alex + by alex
- - + + Open Mamar @@ -86,8 +86,7 @@

Contributing

Mamar is open-source and contributions are welcome!

- The source code is available on GitHub. - If you're unable to contribute code but still want to support me, consider donating! + The source code is available on GitHub.

diff --git a/readme.md b/readme.md index 992e6c0..ae12cfb 100644 --- a/readme.md +++ b/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 diff --git a/yarn.lock b/yarn.lock index 86ab8cf..d6afabd 100644 --- a/yarn.lock +++ b/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"