Skip to content

Commit d83b15e

Browse files
committed
v1.0.5
1 parent c1b61d5 commit d83b15e

128 files changed

Lines changed: 3386 additions & 18 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package-lock.json

Lines changed: 56 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"cookie": "0.5.0",
5050
"copy-webpack-plugin": "6.4.1",
5151
"core-js": "3.45.0",
52+
"cross-fetch": "^4.1.0",
5253
"css-loader": "^1.0.0",
5354
"dapjs": "2.3.0",
5455
"es6-object-assign": "1.1.0",
@@ -98,8 +99,7 @@
9899
"text-encoding": "0.7.0",
99100
"to-style": "1.3.3",
100101
"wav-encoder": "1.3.0",
101-
"xhr": "2.5.0",
102-
"cross-fetch": "4.1.0"
102+
"xhr": "2.5.0"
103103
},
104104
"peerDependencies": {
105105
"react": "^16.0.0",

src/containers/extension-library.jsx

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,47 @@ const fetchLibrary = async () => {
165165
incompatibleWithScratch: !extension.scratchCompatible,
166166
featured: true
167167
}));
168+
/*Mist*/
169+
res = await fetch('https://extensions.mistium.com/generated-metadata/extensions-v0.json');
170+
if (!res.ok) {
171+
throw new Error(`HTTP status ${res.status}`);
172+
}
173+
data = await res.json();
174+
const mistdata=data.extensions.map(extension => ({
175+
name: extension.name,
176+
nameTranslations: extension.nameTranslations || {},
177+
description: extension.description,
178+
descriptionTranslations: extension.descriptionTranslations || {},
179+
extensionId: extension.id,
180+
extensionURL: `https://extensions.mistium.com/featured/${extension.name}.js`,
181+
iconURL: `https://extensions.mistium.com/${extension.image || 'images/unknown.svg'}`,
182+
tags: ['mist'],
183+
credits: [
184+
...(extension.original || []),
185+
...(extension.by || [])
186+
].map(credit => {
187+
if (credit.link) {
188+
return (
189+
<a
190+
href={credit.link}
191+
target="_blank"
192+
rel="noreferrer"
193+
key={credit.name}
194+
>
195+
{credit.name}
196+
</a>
197+
);
198+
}
199+
return credit.name;
200+
}),
201+
docsURI: extension.docs ? `https://extensions.turbowarp.org/${extension.slug}` : null,
202+
samples: extension.samples ? extension.samples.map(sample => ({
203+
href: `${process.env.ROOT}editor?project_url=https://extensions.turbowarp.org/samples/${encodeURIComponent(sample)}.sb3`,
204+
text: sample
205+
})) : null,
206+
incompatibleWithScratch: !extension.scratchCompatible,
207+
featured: true
208+
}));
168209

169210
/*pm*/
170211
data = {
@@ -658,7 +699,7 @@ const fetchLibrary = async () => {
658699
featured: true
659700
}));
660701

661-
return ztdata.concat(twdata,pmdata);
702+
return ztdata.concat(twdata,pmdata,mistdata);
662703
};
663704

664705
class ExtensionLibrary extends React.PureComponent {

src/containers/target-pane.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ function base64ToUint8Array(base64String) {
144144
);
145145
*/
146146
//this.props.vm.addSprite(JSON.stringify(emptyItem)).then(() => {
147-
const empt="UEsDBAoAAAAIAM1jC1uBqxBiJgEAAM8BAAALAAAAc3ByaXRlLmpzb26Nkb9OwzAQxl8F3RzR/CGlyVqBxEoXEGI4x05k4cTIdqKWKBIrYuMBEBs774RU3oJzmqhiY/u+88/+7s49SLtxWAnIS1RWBNBgTQbC+KKpZCMWi/3n2/7lK4IAOjQSmRIW8n4IQEnrJsmMRl7g0StdPEy60HUtmvmkaI0ht9bWtT4o9MCoCbjr5/if54/v91cfyqSr8fFaWK1aJ3UDeRQAR4eX2tToiLVdRRxaK9wVJ58kSYZxliaYsHIZM7YKRXpWlul5ylkhOME1T8XW/YM9PTxutEMfvqbWhbkZ2/5bu6XacB+A1W3D/SikO2rZTxOFhHfSStod5M60tOYt5MkygB3k8YpuyaeZ49KI4jBo5q3BqsLx4vRBc+7G7XwVUKkTND4Whl9QSwMECgAAAAgAzWMLW2/EAsGSAAAAyAAAACQAAAAzMzM5YTI5NTNhM2JmNjJiYjgwZTU0ZmY1NzVkYmNlZC5zdmdtjk0OgjAUhPec4vn2/UFXEGBB4gk8gdKGNgIl7bOttxfBpZnNZOZLZpoQR8jztIQWDdFaC5FS4unCnR/FWUopNgIPpM6TXZ7/wLKqKrG3CFH7YN3SYslLhGQVmRYlgtF2NLTbaHXqXd487MKuAGhOjME1r86TVvB4w23wdxoMMPgNhiPgsyWu1UsAY13RfA92H1BLAQIUAAoAAAAIAM1jC1uBqxBiJgEAAM8BAAALAAAAAAAAAAAAAAAAAAAAAABzcHJpdGUuanNvblBLAQIUAAoAAAAIAM1jC1tvxALBkgAAAMgAAAAkAAAAAAAAAAAAAAAAAE8BAAAzMzM5YTI5NTNhM2JmNjJiYjgwZTU0ZmY1NzVkYmNlZC5zdmdQSwUGAAAAAAIAAgCLAAAAIwIAAAAA";
147+
const empt="UEsDBAoAAAAIAPtDEFvpQGoKHgEAAMUBAAALAAAAc3ByaXRlLmpzb26NkcFKxDAQhl9F5lykbey67XVB8OpeFPEwadISTBtJ0rJrKXgVbz6AePPuOwnrWzjptog3b/NPvpl/ZjKAcluPtYSiQu1kBC02JODw8Xp4/kwggh6tQq6lg2IYI9DK+Tnk1qAo8VdrU97PcWmaRrbLS9lZS2pjnO9C+zgAU0zA7bCYfj+9f729BFOufIMPV9IZ3XllWiiSCAR6vDC2QU+s62vi0DnpLwVpxliOaZ4xZLxapZyvY5mdVVV2ngleSkFwIzK58/9gT4/NrfEYzDc0urTX09h/czeUG+8icKZrRViF4p5GDtskMeG9copuB4W3HR13BwVbRbCHIl1TlXpcOKGsLI+L5kFarGucCudvWXy3fh+ygFqfoA22MP4AUEsDBAoAAAAIAPtDEFtvxALBkgAAAMgAAAAkAAAAMzMzOWEyOTUzYTNiZjYyYmI4MGU1NGZmNTc1ZGJjZWQuc3ZnbY5NDoIwFIT3nOL59v1BVxBgQeIJPIHShjYCJe2zrbcXwaWZzWTmS2aaEEfI87SEFg3RWguRUuLpwp0fxVlKKTYCD6TOk12e/8CyqiqxtwhR+2Dd0mLJS4RkFZkWJYLRdjS022h16l3ePOzCrgBoTozBNa/Ok1bweMNt8HcaDDD4DYYj4LMlrtVLAGNd0XwPdh9QSwECFAAKAAAACAD7QxBb6UBqCh4BAADFAQAACwAAAAAAAAAAAAAAAAAAAAAAc3ByaXRlLmpzb25QSwECFAAKAAAACAD7QxBbb8QCwZIAAADIAAAAJAAAAAAAAAAAAAAAAABHAQAAMzMzOWEyOTUzYTNiZjYyYmI4MGU1NGZmNTc1ZGJjZWQuc3ZnUEsFBgAAAAACAAIAiwAAABsCAAAAAA==";
148148
this.props.vm.addSprite(base64ToUint8Array(empt)).then(() => {
149149
setTimeout(() => { // Wait for targets update to propagate before tab switching
150150
this.props.onActivateTab(COSTUMES_TAB_INDEX);

src/lib/libraries/extensions/index.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ export default [
360360
{
361361
name: (
362362
<FormattedMessage
363-
defaultMessage="TurboWarp Blocks"
363+
defaultMessage="{APP_NAME} Blocks"
364364
description="Name of the strange 'TurboWarp Blocks' extension"
365365
id="tw.twExtension.name"
366366
values={{
@@ -407,7 +407,7 @@ export default [
407407
export const galleryLoading = {
408408
name: (
409409
<FormattedMessage
410-
defaultMessage="TurboWarp Extension Gallery"
410+
defaultMessage="{APP_NAME} Extension Gallery"
411411
description="Name of extensions.turbowarp.org in extension library"
412412
id="tw.extensionGallery.name"
413413
values={{
@@ -433,7 +433,7 @@ export const galleryLoading = {
433433
export const galleryMore = {
434434
name: (
435435
<FormattedMessage
436-
defaultMessage="TurboWarp Extension Gallery"
436+
defaultMessage="{APP_NAME} Extension Gallery"
437437
description="Name of extensions.turbowarp.org in extension library"
438438
id="tw.extensionGallery.name"
439439
values={{
@@ -459,7 +459,7 @@ export const galleryMore = {
459459
export const galleryError = {
460460
name: (
461461
<FormattedMessage
462-
defaultMessage="TurboWarp Extension Gallery"
462+
defaultMessage="{APP_NAME} Extension Gallery"
463463
description="Name of extensions.turbowarp.org in extension library"
464464
id="tw.extensionGallery.name"
465465
values={{

src/lib/libraries/tw-extension-tags.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import {APP_NAME} from '../brand';
33
// Because there are all brand names, it is unnecessary for them to be translatable.
44
export default [
55
{tag: 'scratch', intlLabel: 'Scratch'},
6-
{tag: 'tw', intlLabel: 'TurboWarp'},
6+
{tag: 'tw', intlLabel: 'Turbowarp'},
77
{tag: 'ztengine', intlLabel: '02Engine'},
8-
{tag: 'pm', intlLabel: 'PenguinMod'}
8+
{tag: 'pm', intlLabel: 'PenguinMod'},
9+
{tag: 'mist', intlLabel: 'Mistium Extensions'}
910
];

translations/messages/node_modules/scratch-paint/src/components/color-picker/color-picker.json

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

translations/messages/node_modules/scratch-paint/src/components/fixed-tools/fixed-tools.json

Lines changed: 52 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

translations/messages/node_modules/scratch-paint/src/components/font-dropdown/font-dropdown.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

translations/messages/node_modules/scratch-paint/src/components/mode-tools/mode-tools.json

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)