Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into testing
Browse files Browse the repository at this point in the history
  • Loading branch information
curiousdannii committed Oct 26, 2024
2 parents 52db21e + 678920e commit 18df014
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[submodule "src/upstream/asyncglk"]
path = src/upstream/asyncglk
url = https://github.com/curiousdannii/asyncglk.git
url = ../../curiousdannii/asyncglk.git
[submodule "src/upstream/emglken"]
path = src/upstream/emglken
url = https://github.com/curiousdannii/emglken.git
url = ../../curiousdannii/emglken.git
[submodule "src/upstream/glkote"]
path = src/upstream/glkote
url = https://github.com/curiousdannii/glkote.git
url = ../../curiousdannii/glkote.git
[submodule "src/upstream/ifvms.js"]
path = src/upstream/ifvms.js
url = https://github.com/curiousdannii/ifvms.js.git
url = ../../curiousdannii/ifvms.js.git
[submodule "src/upstream/quixe"]
path = src/upstream/quixe
url = https://github.com/curiousdannii/quixe.git
url = ../../curiousdannii/quixe.git
2 changes: 1 addition & 1 deletion src/common/file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export async function fetch_vm_resource(options: ParchmentOptions, path: string,
if (!path.endsWith('.wasm')) {
throw new Error(`Can't load ${path} in single file mode`)
}
return parse_base64(data, 'wasm')
return parse_base64(data)
}

if (path.endsWith('.js')) {
Expand Down
3 changes: 3 additions & 0 deletions src/common/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ export function get_default_options(): ParchmentOptions {
auto_launch: 1,
Dialog: new ProviderBasedBrowserDialog(),
direct_domains: [
'ifarchive.org',
'mirror.ifarchive.org',
'unbox.ifarchive.org',
'www.ifarchive.org',
],
do_vm_autosave: 1,
//Glk: GlkOte_GlkApi,
Expand Down
2 changes: 1 addition & 1 deletion src/upstream/asyncglk

0 comments on commit 18df014

Please sign in to comment.