From c1de364a409c2298bb10b4b637c18fb0e911e82b Mon Sep 17 00:00:00 2001 From: WlodekM <75479945+WlodekM@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:45:06 +0200 Subject: [PATCH 1/3] dont use jwklong.github.io --- README.md | 2 +- src/components/prompt/prompt.jsx | 2 +- src/components/tw-description/description.jsx | 2 +- src/components/tw-studioview/studioview.js | 2 +- src/playground/credits/users.js | 2 +- src/playground/render-interface.jsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 450eea6533d..0e4b06bf420 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -scratch-gui modified for use in [TurboWarp](https://turbowarp.org/) then modified for use in [PenguinMod](https://jwklong.github.io/penguinmod.github.io) 😀 +scratch-gui modified for use in [TurboWarp](https://turbowarp.org/) then modified for use in [PenguinMod](https://penguinmod.com) 😀 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/PenguinMod/penguinmod.github.io/) ## Setup diff --git a/src/components/prompt/prompt.jsx b/src/components/prompt/prompt.jsx index 3e4843128be..de3202bca5d 100644 --- a/src/components/prompt/prompt.jsx +++ b/src/components/prompt/prompt.jsx @@ -147,7 +147,7 @@ const PromptComponent = props => ( values={{ packager: ( diff --git a/src/components/tw-description/description.jsx b/src/components/tw-description/description.jsx index 7749e2c2fb1..2fbc6bb288b 100644 --- a/src/components/tw-description/description.jsx +++ b/src/components/tw-description/description.jsx @@ -228,7 +228,7 @@ class Renderer { if (/^\d{6,}$/.test(id)) { return ( {`#${id}`} diff --git a/src/components/tw-studioview/studioview.js b/src/components/tw-studioview/studioview.js index 1250adcbe16..9bfd6a69550 100644 --- a/src/components/tw-studioview/studioview.js +++ b/src/components/tw-studioview/studioview.js @@ -307,7 +307,7 @@ StudioView.THUMBNAIL_SRC = 'https://projects.penguinmod.com/api/v1/projects/getp // The URL for project pages. // $id is replaced with the project ID. -StudioView.PROJECT_PAGE = 'https://jwklong.github.io/penguinmod.github.io/#$id'; +StudioView.PROJECT_PAGE = 'https://penguinmod.com/#$id'; // The amount of "placeholders" to insert before the next page loads. StudioView.PLACEHOLDER_COUNT = 9; diff --git a/src/playground/credits/users.js b/src/playground/credits/users.js index 33cb76dd592..fd92d8ad410 100644 --- a/src/playground/credits/users.js +++ b/src/playground/credits/users.js @@ -21,7 +21,7 @@ const fromHardcodedGithub = username => ({ }); const fromHardcodedNamed = username => ({ image: `https://penguinmod.com/unknown_user.png`, - href: "https://jwklong.github.io/penguinmod.github.io/credits.html#", + href: "https://penguinmod.com/credits.html#", text: username }); diff --git a/src/playground/render-interface.jsx b/src/playground/render-interface.jsx index 58eb081c6b8..814156b90d1 100644 --- a/src/playground/render-interface.jsx +++ b/src/playground/render-interface.jsx @@ -164,7 +164,7 @@ const Footer = () => (
-
+
penguinmod.com (and any subdomains) are currently
- provided by NotHouse.
+ provided by enderhacker.
@@ -118,13 +118,33 @@ const Credits = () => (
The list order is randomized on each refresh.
++ All PenguinMod costumes are downloaded or created from: +
This is the current list of user-submitted costume creators:
+The list order is randomized on each refresh.
- PenguinMod has added some more sounds to the Sound Library. - All PenguinMod sounds are - from https://freesound.org/ and https://archive.org/ under - Public Domain licenses. + All PenguinMod sounds are downloaded or created from: +
This is the current list of user-submitted sound creators:
+The list order is randomized on each refresh.
Login is managed
diff --git a/src/playground/credits/users.js b/src/playground/credits/users.js
index 53095256bf9..28c905f43cd 100644
--- a/src/playground/credits/users.js
+++ b/src/playground/credits/users.js
@@ -25,15 +25,6 @@ const fromHardcodedNamed = username => ({
text: username
});
-const fromHardcodedDiscord = async userId => {
- const res = await fetch(`https://pmupdatereader.jeremygamer13.repl.co/user/${userId}`);
- const json = await res.json();
- return {
- image: json.avatarURL,
- text: json.username
- };
-};
-
const addonDevelopers = [
{
userId: '34018398',
@@ -136,20 +127,73 @@ const pmDevelopers = [
].map(fromHardcodedGithub);
const pmPullRequestDevelopers = [ // these people made a PR that got merged, or got a dev to add something they made
- 'NexusKitten',
- 'LilyMakesThings',
- 'MikeDev101',
- 'kokofixcomputers',
- 'PPPDUD',
- 'qbjl',
- 'minidogg',
- 'concertalyis',
- 'Steve0Greatness',
- 'ilikecoding-197',
- 'NotEmbin',
- 'NotCryptid' // rx or ry single fix
+ {
+ text: 'NexusKitten',
+ image: `https://github.com/NexusKitten.png`,
+ href: `https://github.com/NexusKitten/`,
+ },
+ {
+ text: 'LilyMakesThings',
+ image: `https://github.com/LilyMakesThings.png`,
+ href: `https://github.com/LilyMakesThings/`,
+ },
+ {
+ text: 'MikeDev101',
+ image: `https://github.com/MikeDev101.png`,
+ href: `https://github.com/MikeDev101/`,
+ },
+ {
+ text: 'kokofixcomputers',
+ image: `https://github.com/kokofixcomputers.png`,
+ href: `https://github.com/kokofixcomputers/`,
+ },
+ {
+ text: 'PPPDUD',
+ image: `https://github.com/PPPDUD.png`,
+ href: `https://github.com/PPPDUD/`,
+ },
+ {
+ text: 'qbjl',
+ image: `https://github.com/qbjl.png`,
+ href: `https://github.com/qbjl/`,
+ },
+ {
+ text: 'minidogg',
+ image: `https://github.com/minidogg.png`,
+ href: `https://github.com/minidogg/`,
+ },
+ {
+ text: 'concertalyis',
+ image: `https://github.com/concertalyis.png`,
+ href: `https://github.com/concertalyis/`,
+ },
+ {
+ text: 'Steve0Greatness',
+ image: `https://github.com/Steve0Greatness.png`,
+ href: `https://github.com/Steve0Greatness/`,
+ },
+ {
+ text: 'ilikecoding-197',
+ image: `https://github.com/ilikecoding-197.png`,
+ href: `https://github.com/ilikecoding-197/`,
+ },
+ {
+ text: 'NotEmbin',
+ image: `https://github.com/NotEmbin.png`,
+ href: `https://github.com/NotEmbin/`,
+ },
+ { // rx or ry single fix
+ text: 'NotCryptid',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: `https://github.com/NotCryptid/`,
+ },
+ {
+ text: 'DogeisCut',
+ image: `https://github.com/DogeisCut.png`,
+ href: `https://github.com/Dogeiscut/`,
+ },
// list could be missing some people, but theres not really a way to tell
-].map(fromHardcodedGithub);
+];
const pmApiDevelopers = [
'JeremyGamer13',
@@ -160,22 +204,26 @@ const pmApiDevelopers = [
'enderhacker'
].map(fromHardcodedGithub);
-// todo: should translators be only named or...?
const pmTranslators = [
{
text: 'kolikiscool',
image: `https://penguinmod.com/unknown_user.png`,
- href: "https://jwklong.github.io/penguinmod.github.io/credits.html#",
+ href: "https://studio.penguinmod.com/credits.html#",
},
{
text: 'n0name',
image: `https://penguinmod.com/unknown_user.png`,
- href: "https://jwklong.github.io/penguinmod.github.io/credits.html#",
+ href: "https://studio.penguinmod.com/credits.html#",
},
{
text: 'a_pc',
image: `https://penguinmod.com/unknown_user.png`,
- href: "https://jwklong.github.io/penguinmod.github.io/credits.html#",
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'LoyalBlackBishopyBoi',
+ image: `https://trampoline.turbowarp.org/avatars/by-username/LoyalBlackBishopyBoi`,
+ href: "https://scratch.mit.edu/users/LoyalBlackBishopyBoi/",
},
{
text: 'onetoanother',
@@ -215,7 +263,7 @@ const pmTranslators = [
{
text: 'SmolBoi37',
image: `https://penguinmod.com/unknown_user.png`,
- href: "https://jwklong.github.io/penguinmod.github.io/credits.html#",
+ href: "https://studio.penguinmod.com/credits.html#",
},
{
text: 'GigantTech',
@@ -293,7 +341,7 @@ const pmTranslators = [
{
text: 'con-zie',
image: `https://penguinmod.com/unknown_user.png`,
- href: "https://jwklong.github.io/penguinmod.github.io/credits.html#",
+ href: "https://studio.penguinmod.com/credits.html#",
},
{
text: 'ImNotScratchY_lolol',
@@ -337,9 +385,154 @@ const pmTranslators = [
},
];
-const logoArtists = Promise.all([
- '593554048188416001'
-].map(fromHardcodedDiscord));
+const pmCostumeSubmittors = [
+ // accounts
+ {
+ text: 'budc123',
+ image: `https://github.com/budc123.png`,
+ href: `https://github.com/budc123/`,
+ },
+ {
+ text: 'concertalyis',
+ image: `https://github.com/concertalyis.png`,
+ href: `https://github.com/concertalyis/`,
+ },
+ {
+ text: 'WojtekCodesToday',
+ image: `https://github.com/WojtekCodesToday.png`,
+ href: `https://github.com/WojtekCodesToday/`,
+ },
+ {
+ text: 'ddededodediamante',
+ image: `https://github.com/ddededodediamante.png`,
+ href: `https://github.com/ddededodediamante/`,
+ },
+ {
+ text: 'G1nX',
+ image: `https://trampoline.turbowarp.org/avatars/by-username/G1nX`,
+ href: "https://penguinmod.com/profile?user=G1nX",
+ },
+ // unknown
+ {
+ text: 'maroonmball',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'eviepepsi',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: '1340073',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'cubeycreator',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'novaspiderultra',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'poundpound0209',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'gdplayer1035',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'cognitixsammy',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'thebusyman',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'skyglide5',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'cxnnie09',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'hoveras',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'blockgamer904',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+];
+const pmSoundSubmittors = [
+ // accounts
+ {
+ text: 'ddededodediamante',
+ image: `https://github.com/ddededodediamante.png`,
+ href: `https://github.com/ddededodediamante/`,
+ },
+ {
+ text: 'concertalyis',
+ image: `https://github.com/concertalyis.png`,
+ href: `https://github.com/concertalyis/`,
+ },
+ {
+ text: 'G1nX',
+ image: `https://trampoline.turbowarp.org/avatars/by-username/G1nX`,
+ href: "https://penguinmod.com/profile?user=G1nX",
+ },
+ // unknown
+ {
+ text: 'maroonmball',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'jn567',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'lukepuke311',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'ma_01',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'poundpound0209',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'cognitixsammy',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+ {
+ text: 'mememaster9000',
+ image: `https://penguinmod.com/unknown_user.png`,
+ href: "https://studio.penguinmod.com/credits.html#",
+ },
+];
const extensionDevelopers = [
'GarboMuffin',
@@ -360,7 +553,7 @@ const pmExtensionDevelopers = [
'WAYLIVES',
'MrRedstonia',
'MikeDev101',
- 'BopShoes',
+ 'liablelua',
'AlexSchoolOH',
'Monochromasity',
'LilyMakesThings',
@@ -370,16 +563,17 @@ const pmExtensionDevelopers = [
'oc9x97',
'lego7set',
'mariocraft987',
- 'Ashimee'
+ 'AshimeeAlt'
].map(fromHardcodedGithub);
export default {
addonDevelopers: shuffle(addonDevelopers),
pmDevelopers: shuffle(pmDevelopers),
- logoArtists: shuffle(logoArtists),
extensionDevelopers: shuffle(extensionDevelopers),
pmExtensionDevelopers: shuffle(pmExtensionDevelopers),
pmApiDevelopers: shuffle(pmApiDevelopers),
pmTranslators: shuffle(pmTranslators),
+ pmSoundSubmittors: shuffle(pmSoundSubmittors),
+ pmCostumeSubmittors: shuffle(pmCostumeSubmittors),
pmPullRequestDevelopers: shuffle(pmPullRequestDevelopers)
};
diff --git a/src/playground/render-interface.jsx b/src/playground/render-interface.jsx
index 3a97045b6a6..b9525a1ce62 100644
--- a/src/playground/render-interface.jsx
+++ b/src/playground/render-interface.jsx
@@ -450,7 +450,7 @@ class Interface extends React.Component {
className={styles.shareLink}
>
{'Copy Link'}
diff --git a/src/reducers/tw.js b/src/reducers/tw.js
index ca82ab73f69..1fa73e032cd 100644
--- a/src/reducers/tw.js
+++ b/src/reducers/tw.js
@@ -33,6 +33,7 @@ export const initialState = {
maxClones: 300,
miscLimits: true,
dangerousOptimizations: false,
+ disableOffscreenRendering: false,
fencing: true
},
isWindowFullScreen: false,
diff --git a/static/favicon.png b/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d361c2365daf97043aa0952b4ef3068a2d2a1742
GIT binary patch
literal 8993
zcmV++Bi`JJP) wTD&A(zT~#6!ioqHEF<|Lyb3y1qUA8o96*Mr@Wke{;ZNNH;JeEh
z0_pVk?2mIG1hV#AAAHOu82+Ox5P>}a3E+1dzB;au06N*GXCT*5w2zt&FM!Sy%6+qq
z!tyn V$~8|db?IDL3j
z9ZiUZRXg6Q@T1M^1AB`zT_wT~3+>WTV$Jj(dDA_ckY)+A0$4$(JWxrF*%gji2JGx2
z5*9+gfXy9|Dh_&lXk-pL>|6aT{_3xUR85;9uFf($v`8v1-
z)bIz$O)6q|3F#)Jn~`n~2W}QIdh>|kq}k{Ej(^*fe`SH$ UTG);_(>%V7$Fm@n3oK4gKOv2bM(K
zL?di=$>Sbvqh9+kGdxw@EzBE*ma{egy$%5#*+1elgCowNem!$U#J|DQc
7 4Tx04UFukxM84>qv!GX`x)M4-#)-v{eNP;2_b{ys6z*vawig&^XBd|O4P?Zsd
zl}5O7zb^D5