diff --git a/json/faq.json b/json/faq.json index aaa93ac5..afe34377 100644 --- a/json/faq.json +++ b/json/faq.json @@ -16,7 +16,7 @@ }, { "question": "Where can I download Faithful?", - "answer": "Each pack has its own page where downloads and articles are linked. These pages can be found using the links here:\n- [Faithful 32x](https://faithfulpack.net/faithful32x)\n- [Faithful 64x](https://faithfulpack.net/faithful64x)\n- [Classic Faithful 32x Jappa](https://faithfulpack.net/classicfaithful/32x-jappa)\n- [Classic Faithful 32x Programmer Art](https://faithfulpack.net/classicfaithful/32x-programmer-art)\n- [Classic Faithful 64x](https://faithfulpack.net/classicfaithful/64x-jappa)", + "answer": "Each pack has its own page where downloads and articles are linked. These pages can be found using the links here:\n- [Faithful 32x](https://faithfulpack.net/faithful32x)\n- [Faithful 64x](https://faithfulpack.net/faithful64x)\n- [Classic Faithful 32x](https://faithfulpack.net/classicfaithful/32x-programmer-art)\n- [Classic Faithful 32x Jappa](https://faithfulpack.net/classicfaithful/32x-jappa)\n- [Classic Faithful 64x Jappa](https://faithfulpack.net/classicfaithful/64x-jappa)", "keywords": ["downloads", "download"] }, { @@ -81,7 +81,7 @@ }, { "question": "But I don't like the new Minecraft textures! Faithful Programmer Art when?", - "answer": "You can use [Classic Faithful 32x Programmer Art](https://faithfulpack.net/classicfaithful/32x-programmer-art). There are plans for a dedicated Faithful Programmer Art pack in the future, but for the time being all main Faithful packs are based off the newest, \"Jappa\" textures.", + "answer": "[Classic Faithful 32x](https://faithfulpack.net/classicfaithful/32x-programmer-art) is the programmer art counterpart to Faithful, complete with the original textures from 2011 by Vattic. There are plans for a modern Faithful-styled Programmer Art pack in the future, but for the time being all programmer art packs are based on the original Faithful art from that time period.", "keywords": ["faithful programmer art", "faithful progart", "faithful pa"] }, { diff --git a/src/commands/info/media.ts b/src/commands/info/media.ts index eeb67f0c..2a2d9bf4 100644 --- a/src/commands/info/media.ts +++ b/src/commands/info/media.ts @@ -16,9 +16,9 @@ export const command: SlashCommand = { .addChoices( { name: "Faithful 32x", value: "faithful_32x" }, { name: "Faithful 64x", value: "faithful_64x" }, + { name: "Classic Faithful 32x", value: "classic_faithful_32x_progart" }, { name: "Classic Faithful 32x Jappa", value: "classic_faithful_32x" }, - { name: "Classic Faithful 32x Programmer Art", value: "classic_faithful_32x_progart" }, - { name: "Classic Faithful 64x", value: "classic_faithful_64x" }, + { name: "Classic Faithful 64x Jappa", value: "classic_faithful_64x" }, // TODO: add cf64pa when listings are added { name: "All", value: "all" }, ), diff --git a/src/helpers/utility/emojis.ts b/src/helpers/utility/emojis.ts index 20346558..74eb4a71 100644 --- a/src/helpers/utility/emojis.ts +++ b/src/helpers/utility/emojis.ts @@ -7,14 +7,16 @@ export const emojis = { github: "1129461571601567855", mcpedl: "1129458566659575918", // project logos - f32_logo: "963455577630064741", - f64_logo: "963455576690556998", - dungeons_logo: "963455576649905890", - extras_logo: "1129462668185575464", - mods_logo: "963455576833138720", - faithful_logo: "1129462670681198714", - tweaks_logo: "963455577453887518", - addons_logo: "963455574656286750", + main_logo: "1324112546176700530", + f32_logo: "1324112542871589004", + f64_logo: "1324112544557957160", + add_ons_logo: "1324112525767479298", + mods_logo: "1324112547997028513", + cf_main_logo: "1324112528258895902", + cf32_logo: "1324112533526941828", + cf32j_logo: "1324112535892263003", + cf64_logo: "1324112539038257162", + cf64j_logo: "1324112540720037960", // image buttons magnify: "918186631226339339", palette: "918186650822131742", diff --git a/src/helpers/utility/infoembed.ts b/src/helpers/utility/infoembed.ts index 9c496adb..863bb6f0 100644 --- a/src/helpers/utility/infoembed.ts +++ b/src/helpers/utility/infoembed.ts @@ -5,7 +5,7 @@ export const media: Record = { faithful_32x: { title: `Faithful 32x:`, description: ` -[${parseID(emojis.faithful_logo)} Website](https://faithfulpack.net/faithful32x) +[${parseID(emojis.main_logo)} Website](https://faithfulpack.net/faithful32x) [${parseID(emojis.curseforge)} Java Edition CurseForge](https://curseforge.com/minecraft/texture-packs/faithful-32x) @@ -24,7 +24,7 @@ export const media: Record = { faithful_64x: { title: "Faithful 64x:", description: ` -[${parseID(emojis.faithful_logo)} Website](https://faithfulpack.net/faithful64x) +[${parseID(emojis.main_logo)} Website](https://faithfulpack.net/faithful64x) [${parseID(emojis.curseforge)} Java Edition CurseForge](https://curseforge.com/minecraft/texture-packs/faithful-64x) @@ -45,7 +45,7 @@ export const media: Record = { classic_faithful_32x_progart: { title: "Classic Faithful 32x:", description: ` -[${parseID(emojis.faithful_logo)} Website](https://faithfulpack.net/classicfaithful/32x-programmer-art) +[${parseID(emojis.main_logo)} Website](https://faithfulpack.net/classicfaithful/32x-programmer-art) [${parseID(emojis.curseforge)} CurseForge](https://curseforge.com/minecraft/texture-packs/classic-faithful-32x-pa) @@ -65,7 +65,7 @@ export const media: Record = { classic_faithful_32x: { title: "Classic Faithful 32x Jappa:", description: ` -[${parseID(emojis.faithful_logo)} Website](https://faithfulpack.net/classicfaithful/32x-jappa) +[${parseID(emojis.main_logo)} Website](https://faithfulpack.net/classicfaithful/32x-jappa) [${parseID(emojis.curseforge)} CurseForge](https://curseforge.com/minecraft/texture-packs/classic-faithful-32x-jappa) @@ -84,7 +84,7 @@ export const media: Record = { classic_faithful_64x: { title: "Classic Faithful 64x Jappa:", description: ` -[${parseID(emojis.faithful_logo)} Website](https://faithfulpack.net/classicfaithful/64x-jappa) +[${parseID(emojis.main_logo)} Website](https://faithfulpack.net/classicfaithful/64x-jappa) [${parseID(emojis.curseforge)} CurseForge](https://curseforge.com/minecraft/texture-packs/classic-faithful-64x)