From 3f93041ca238a31829992fc597ede34afdc8c29b Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Fri, 19 Dec 2025 13:24:14 -0800
Subject: [PATCH] Improve editing project versions (#4933)

* add edit versions dropdown menu

* implement improved edit version with individual edit stages

* make changelog bigger

* update button styles

* remove hover button when hover on row

* bring editing versions back to project settings

* bring back gallery edit and upload in project page

* fix progress value

* fix admonition import

* fix v3 upload for modpacks

* fix modpack loader display for editing version and better open edit/create modal handling

* fix currentMember prop

* fix modpack loader displaying incorrectly

* fix max length

* fix version url after making an edit to version and fix delete

* small max height fix

* hide edit dependencies for modpack

* pnpm run fix

* fix import

* add tooltip

* update icons

* update copy and create version button style
---
 .../CreateProjectVersionModal.vue             |  51 ++++-
 .../stages/AddChangelogStage.vue              |  12 +-
 .../stages/AddDependenciesStage.vue           |   2 +-
 .../stages/AddDetailsStage.vue                |  12 +-
 .../stages/AddEnvironmentStage.vue            |   4 +-
 .../stages/AddFilesStage.vue                  |   2 +-
 .../stages/AddLoadersStage.vue                |   2 +-
 .../stages/AddMcVersionsStage.vue             |   2 +-
 .../src/pages/[type]/[id]/changelog.vue       |   2 +-
 .../src/pages/[type]/[id]/gallery.vue         |  61 +++++-
 .../pages/[type]/[id]/settings/versions.vue   | 164 +++++++++------
 .../src/pages/[type]/[id]/versions.vue        | 188 +++++++++++++++++-
 .../providers/version/manage-version-modal.ts |  22 +-
 .../providers/version/stages/add-changelog.ts |  22 +-
 .../version/stages/add-dependencies.ts        |  35 ++--
 .../providers/version/stages/add-details.ts   |  41 ++--
 .../version/stages/add-environment.ts         |  24 ++-
 .../src/providers/version/stages/add-files.ts |  15 ++
 .../providers/version/stages/add-loaders.ts   |  24 ++-
 .../version/stages/add-mc-versions.ts         |  24 ++-
 .../src/providers/version/stages/index.ts     |   6 +-
 .../api-client/src/modules/labrinth/types.ts  |   2 +
 .../src/modules/labrinth/versions/v3.ts       |  14 +-
 .../src/components/base/MultiStageModal.vue   |  16 +-
 .../project/ProjectPageVersions.vue           |   3 +-
 25 files changed, 586 insertions(+), 164 deletions(-)

diff --git a/apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue b/apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue
index 74733a8c..68321121 100644
--- a/apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue
+++ b/apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue
@@ -4,7 +4,12 @@
 
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
-import { injectProjectPageContext, MultiStageModal } from '@modrinth/ui'
+import {
+	injectModrinthClient,
+	injectNotificationManager,
+	injectProjectPageContext,
+	MultiStageModal,
+} from '@modrinth/ui'
 import type { ComponentExposed } from 'vue-component-type-helpers'
 
 import {
@@ -20,15 +25,53 @@ provideManageVersionContext(ctx)
 const { newDraftVersion, setProjectType } = ctx
 
 const { projectV2 } = injectProjectPageContext()
+const { addNotification } = injectNotificationManager()
+const { labrinth } = injectModrinthClient()
 
-function showCreateVersionModal(version: Labrinth.Versions.v3.DraftVersion | null = null) {
+async function openEditVersionModal(versionId: string, projectId: string, stageId?: string | null) {
+	try {
+		const versionData = await labrinth.versions_v3.getVersion(versionId)
+
+		const draftVersionData: Labrinth.Versions.v3.DraftVersion = {
+			project_id: projectId,
+			version_id: versionId,
+			name: versionData.name ?? '',
+			version_number: versionData.version_number ?? '',
+			changelog: versionData.changelog ?? '',
+			game_versions: versionData.game_versions ?? [],
+			version_type: versionData.version_type ?? 'release',
+			loaders: versionData.loaders ?? [],
+			dependencies: versionData.dependencies ?? [],
+			existing_files: versionData.files ?? [],
+			environment: versionData.environment,
+		}
+
+		if (projectV2.value.project_type === 'modpack' && draftVersionData.loaders.includes('mrpack')) {
+			draftVersionData.loaders.push(...(versionData.mrpack_loaders ?? []))
+		}
+
+		openCreateVersionModal(draftVersionData, stageId)
+	} catch (err: any) {
+		addNotification({
+			title: 'An error occurred',
+			text: err.data ? err.data.description : err,
+			type: 'error',
+		})
+	}
+}
+
+function openCreateVersionModal(
+	version: Labrinth.Versions.v3.DraftVersion | null = null,
+	stageId: string | null = null,
+) {
 	newDraftVersion(projectV2.value.id, version)
 	setProjectType(projectV2.value)
-	modal.value?.setStage(0)
+	modal.value?.setStage(stageId ?? 0)
 	modal.value?.show()
 }
 
 defineExpose({
-	show: showCreateVersionModal,
+	openEditVersionModal,
+	openCreateVersionModal,
 })
 </script>
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue
index 476863a0..45d49446 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue
@@ -1,9 +1,11 @@
 <template>
-	<MarkdownEditor
-		v-model="draftVersion.changelog"
-		:on-image-upload="onImageUpload"
-		:max-height="500"
-	/>
+	<div class="w-full">
+		<MarkdownEditor
+			v-model="draftVersion.changelog"
+			:on-image-upload="onImageUpload"
+			:max-height="500"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue
index 2a44b449..81f78751 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex w-full max-w-full flex-col gap-6">
+	<div class="flex w-full max-w-full flex-col gap-6 sm:w-[512px]">
 		<div class="flex flex-col gap-4">
 			<span class="font-semibold text-contrast">Add dependency</span>
 			<div class="flex flex-col gap-3 rounded-2xl border border-solid border-surface-5 p-4">
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue
index be134c00..aed556f8 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex flex-col gap-6">
+	<div class="flex flex-col gap-6 sm:w-[512px]">
 		<div class="flex flex-col gap-2">
 			<span class="font-semibold text-contrast">
 				Version type <span class="text-red">*</span>
@@ -33,7 +33,7 @@
 				placeholder="Enter subtitle..."
 				type="text"
 				autocomplete="off"
-				maxlength="32"
+				maxlength="256"
 			/>
 		</div>
 
@@ -102,7 +102,7 @@
 				</div>
 
 				<div
-					class="flex flex-col gap-1.5 gap-y-4 rounded-xl border border-solid border-surface-5 p-3 py-4"
+					class="flex max-h-56 flex-col gap-1.5 gap-y-4 overflow-y-auto rounded-xl border border-solid border-surface-5 p-3 py-4"
 				>
 					<div class="flex flex-wrap gap-2">
 						<TagItem
@@ -176,13 +176,13 @@ const loaders = computed(() => generatedState.value.loaders)
 const isModpack = computed(() => projectType.value === 'modpack')
 
 const editLoaders = () => {
-	modal.value?.setStage('edit-loaders')
+	modal.value?.setStage('from-details-loaders')
 }
 const editVersions = () => {
-	modal.value?.setStage('edit-mc-versions')
+	modal.value?.setStage('from-details-mc-versions')
 }
 const editEnvironment = () => {
-	modal.value?.setStage('edit-environment')
+	modal.value?.setStage('from-details-environment')
 }
 
 const usingDetectedVersions = computed(() => {
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue
index 94ab570f..ee04d8a6 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue
@@ -1,5 +1,7 @@
 <template>
-	<ProjectSettingsEnvSelector v-model="draftVersion.environment" />
+	<div class="sm:w-[512px]">
+		<ProjectSettingsEnvSelector v-model="draftVersion.environment" />
+	</div>
 </template>
 
 <script lang="ts" setup>
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue
index d6a20294..bafd30ed 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex w-full flex-col gap-4">
+	<div class="flex w-full flex-col gap-4 sm:w-[512px]">
 		<template v-if="!(filesToAdd.length || draftVersion.existing_files?.length)">
 			<DropzoneFileInput
 				aria-label="Upload file"
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue
index 15a29a01..0fe100ad 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="space-y-6">
+	<div class="space-y-6 sm:w-[512px]">
 		<LoaderPicker
 			v-model="draftVersion.loaders"
 			:loaders="generatedState.loaders"
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue
index d28345b7..06376d18 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex flex-col gap-6">
+	<div class="flex flex-col gap-6 sm:w-[512px]">
 		<McVersionPicker v-model="draftVersion.game_versions" :game-versions="gameVersions" />
 		<div v-if="draftVersion.game_versions.length" class="space-y-1">
 			<div class="flex items-center justify-between">
diff --git a/apps/frontend/src/pages/[type]/[id]/changelog.vue b/apps/frontend/src/pages/[type]/[id]/changelog.vue
index 54a28f8f..42c1e7c4 100644
--- a/apps/frontend/src/pages/[type]/[id]/changelog.vue
+++ b/apps/frontend/src/pages/[type]/[id]/changelog.vue
@@ -47,7 +47,7 @@
 							>
 						</div>
 						<a
-							:href="version.primaryFile.url"
+							:href="version.primaryFile?.url"
 							class="iconified-button download"
 							:title="`Download ${version.name}`"
 						>
diff --git a/apps/frontend/src/pages/[type]/[id]/gallery.vue b/apps/frontend/src/pages/[type]/[id]/gallery.vue
index 448fa983..2c75553f 100644
--- a/apps/frontend/src/pages/[type]/[id]/gallery.vue
+++ b/apps/frontend/src/pages/[type]/[id]/gallery.vue
@@ -196,7 +196,7 @@
 			</div>
 		</div>
 		<Admonition v-if="!hideGalleryAdmonition && currentMember" type="info" class="mb-4">
-			Managing gallery has moved! You can now add and edit gallery images in the
+			Creating and editing gallery images can now be done directly from the
 			<NuxtLink to="settings/gallery" class="font-medium text-blue hover:underline"
 				>project settings</NuxtLink
 			>.
@@ -224,6 +224,27 @@
 				</div>
 			</template>
 		</Admonition>
+		<div v-if="currentMember && project.gallery.length" class="card header-buttons">
+			<FileInput
+				:max-size="5242880"
+				:accept="acceptFileTypes"
+				prompt="Upload an image"
+				aria-label="Upload an image"
+				class="iconified-button brand-button"
+				:disabled="!isPermission(currentMember?.permissions, 1 << 2)"
+				@change="handleFiles"
+			>
+				<UploadIcon aria-hidden="true" />
+			</FileInput>
+			<span class="indicator">
+				<InfoIcon aria-hidden="true" /> Click to choose an image or drag one onto this page
+			</span>
+			<DropArea
+				:accept="acceptFileTypes"
+				:disabled="!isPermission(currentMember?.permissions, 1 << 2)"
+				@change="handleFiles"
+			/>
+		</div>
 		<div v-if="project.gallery.length" class="items">
 			<div v-for="(item, index) in project.gallery" :key="index" class="card gallery-item">
 				<a class="gallery-thumbnail" @click="expandImage(item, index)">
@@ -247,6 +268,37 @@
 						<CalendarIcon aria-hidden="true" aria-label="Date created" />
 						{{ $dayjs(item.created).format('MMMM D, YYYY') }}
 					</div>
+					<div v-if="currentMember" class="gallery-buttons input-group">
+						<button
+							class="iconified-button"
+							@click="
+								() => {
+									resetEdit()
+									editIndex = index
+									editTitle = item.title
+									editDescription = item.description
+									editFeatured = item.featured
+									editOrder = item.ordering
+									$refs.modal_edit_item.show()
+								}
+							"
+						>
+							<EditIcon aria-hidden="true" />
+							Edit
+						</button>
+						<button
+							class="iconified-button"
+							@click="
+								() => {
+									deleteIndex = index
+									$refs.modal_confirm.show()
+								}
+							"
+						>
+							<TrashIcon aria-hidden="true" />
+							Remove
+						</button>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -266,9 +318,11 @@
 import {
 	CalendarIcon,
 	ContractIcon,
+	EditIcon,
 	ExpandIcon,
 	ExternalIcon,
 	ImageIcon,
+	InfoIcon,
 	LeftArrowIcon,
 	PlusIcon,
 	RightArrowIcon,
@@ -276,18 +330,23 @@ import {
 	SettingsIcon,
 	StarIcon,
 	TransferIcon,
+	TrashIcon,
+	UploadIcon,
 	XIcon,
 } from '@modrinth/assets'
 import {
 	Admonition,
 	ButtonStyled,
 	ConfirmModal,
+	DropArea,
 	FileInput,
 	injectNotificationManager,
 	NewModal as Modal,
 } from '@modrinth/ui'
 import { useLocalStorage } from '@vueuse/core'
 
+import { isPermission } from '~/utils/permissions.ts'
+
 const props = defineProps({
 	project: {
 		type: Object,
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/versions.vue b/apps/frontend/src/pages/[type]/[id]/settings/versions.vue
index be80dd6e..fb5c9ee8 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/versions.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/versions.vue
@@ -1,6 +1,9 @@
 <template>
 	<div>
-		<CreateProjectVersionModal ref="modal"></CreateProjectVersionModal>
+		<CreateProjectVersionModal
+			v-if="currentMember"
+			ref="create-project-version-modal"
+		></CreateProjectVersionModal>
 
 		<ConfirmModal
 			v-if="currentMember"
@@ -27,32 +30,59 @@
 						project.slug ? project.slug : project.id
 					}/version/${encodeURI(version.displayUrlEnding)}`
 			"
-			:open-modal="currentMember ? openModal : undefined"
+			:open-modal="currentMember ? () => handleOpenCreateVersionModal() : undefined"
 		>
 			<template #actions="{ version }">
 				<ButtonStyled circular type="transparent">
-					<a
-						v-tooltip="`Download`"
-						:href="getPrimaryFile(version).url"
-						class="group-hover:!bg-brand group-hover:[&>svg]:!text-brand-inverted"
-						aria-label="Download"
-						@click="emit('onDownload')"
-					>
-						<DownloadIcon aria-hidden="true" />
-					</a>
-				</ButtonStyled>
-				<ButtonStyled circular type="transparent">
-					<a
-						v-tooltip="`Edit version`"
-						aria-label="Edit"
-						@click="() => handleOpenEditVersionModal(version)"
+					<OverflowMenu
+						v-tooltip="'Edit version'"
+						class="hover:!bg-button-bg [&>svg]:!text-green"
+						:dropdown-id="`${baseDropdownId}-edit-${version.id}`"
+						:options="[
+							{
+								id: 'edit-details',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+							},
+							{
+								id: 'edit-changelog',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-changelog'),
+							},
+							{
+								id: 'edit-dependencies',
+								action: () =>
+									handleOpenEditVersionModal(version.id, project.id, 'add-dependencies'),
+								shown: project.project_type !== 'modpack',
+							},
+							{
+								id: 'edit-files',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
+							},
+						]"
+						aria-label="Edit version"
 					>
 						<EditIcon aria-hidden="true" />
-					</a>
+						<template #edit-files>
+							<FileIcon aria-hidden="true" />
+							Edit files
+						</template>
+						<template #edit-details>
+							<InfoIcon aria-hidden="true" />
+							Edit details
+						</template>
+						<template #edit-dependencies>
+							<BoxIcon aria-hidden="true" />
+							Edit dependencies
+						</template>
+						<template #edit-changelog>
+							<AlignLeftIcon aria-hidden="true" />
+							Edit changelog
+						</template>
+					</OverflowMenu>
 				</ButtonStyled>
 				<ButtonStyled circular type="transparent">
 					<OverflowMenu
-						class="group-hover:!bg-button-bg"
+						v-tooltip="'More options'"
+						class="hover:!bg-button-bg"
 						:dropdown-id="`${baseDropdownId}-${version.id}`"
 						:options="[
 							{
@@ -110,8 +140,24 @@
 							},
 							{ divider: true, shown: !!currentMember },
 							{
-								id: 'edit',
-								action: () => handleOpenEditVersionModal(version),
+								id: 'edit-details',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+								shown: !!currentMember,
+							},
+							{
+								id: 'edit-changelog',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-changelog'),
+								shown: !!currentMember,
+							},
+							{
+								id: 'edit-dependencies',
+								action: () =>
+									handleOpenEditVersionModal(version.id, project.id, 'add-dependencies'),
+								shown: !!currentMember && project.project_type !== 'modpack',
+							},
+							{
+								id: 'edit-files',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
 								shown: !!currentMember,
 							},
 							{
@@ -148,9 +194,21 @@
 							<ReportIcon aria-hidden="true" />
 							Report
 						</template>
-						<template #edit>
-							<EditIcon aria-hidden="true" />
-							Edit
+						<template #edit-files>
+							<FileIcon aria-hidden="true" />
+							Edit files
+						</template>
+						<template #edit-details>
+							<InfoIcon aria-hidden="true" />
+							Edit details
+						</template>
+						<template #edit-dependencies>
+							<BoxIcon aria-hidden="true" />
+							Edit dependencies
+						</template>
+						<template #edit-changelog>
+							<AlignLeftIcon aria-hidden="true" />
+							Edit changelog
 						</template>
 						<template #delete>
 							<TrashIcon aria-hidden="true" />
@@ -230,7 +288,9 @@
 					<div>Create your first project version.</div>
 					<br />
 					<ButtonStyled color="green">
-						<button @click="openModal"><PlusIcon /> Create version</button>
+						<button @click="() => createProjectVersionModal?.openCreateVersionModal()">
+							<PlusIcon /> Create version
+						</button>
 					</ButtonStyled>
 				</div>
 			</div>
@@ -241,10 +301,14 @@
 <script lang="ts" setup>
 import type { Labrinth } from '@modrinth/api-client'
 import {
+	AlignLeftIcon,
+	BoxIcon,
 	ClipboardCopyIcon,
 	DownloadIcon,
 	EditIcon,
 	ExternalIcon,
+	FileIcon,
+	InfoIcon,
 	LinkIcon,
 	MoreVerticalIcon,
 	PlusIcon,
@@ -261,6 +325,7 @@ import {
 	OverflowMenu,
 	ProjectPageVersions,
 } from '@modrinth/ui'
+import { useTemplateRef } from 'vue'
 
 import CreateProjectVersionModal from '~/components/ui/create-project-version/CreateProjectVersionModal.vue'
 import { reportVersion } from '~/utils/report-helpers.ts'
@@ -278,23 +343,32 @@ const client = injectModrinthClient()
 const { addNotification } = injectNotificationManager()
 const { refreshVersions } = injectProjectPageContext()
 
-const modal = ref<InstanceType<typeof CreateProjectVersionModal>>()
-
-function openModal() {
-	modal.value?.show?.()
-}
-
 const tags = useGeneratedState()
 const flags = useFeatureFlags()
 const auth = await useAuth()
 
+const createProjectVersionModal = useTemplateRef('create-project-version-modal')
 const deleteVersionModal = ref<InstanceType<typeof ConfirmModal>>()
 const selectedVersion = ref<string | null>(null)
 
+const handleOpenCreateVersionModal = () => {
+	if (!currentMember) return
+	createProjectVersionModal.value?.openCreateVersionModal()
+}
+
+const handleOpenEditVersionModal = (
+	versionId: string,
+	projectId: string,
+	stageId?: string | null,
+) => {
+	if (!currentMember) return
+	createProjectVersionModal.value?.openEditVersionModal(versionId, projectId, stageId)
+}
+
 const versionsWithDisplayUrl = computed(() =>
 	versions.value.map((v) => ({
 		...v,
-		displayUrlEnding: v.version_number,
+		displayUrlEnding: v.id,
 	})),
 )
 
@@ -337,30 +411,4 @@ async function deleteVersion() {
 
 	stopLoading()
 }
-
-async function handleOpenEditVersionModal(version: Labrinth.Versions.v3.Version) {
-	selectedVersion.value = version.id
-	try {
-		const versionData = await client.labrinth.versions_v3.getVersion(version.id)
-		modal.value?.show({
-			project_id: project.id,
-			version_id: version.id,
-			name: versionData.name ?? '',
-			version_number: versionData.version_number ?? '',
-			changelog: versionData.changelog ?? '',
-			game_versions: versionData.game_versions ?? [],
-			version_type: versionData.version_type ?? 'release',
-			loaders: versionData.loaders ?? [],
-			dependencies: versionData.dependencies ?? [],
-			existing_files: versionData.files ?? [],
-			environment: versionData.environment,
-		})
-	} catch (err: any) {
-		addNotification({
-			title: 'An error occurred',
-			text: err.data ? err.data.description : err,
-			type: 'error',
-		})
-	}
-}
 </script>
diff --git a/apps/frontend/src/pages/[type]/[id]/versions.vue b/apps/frontend/src/pages/[type]/[id]/versions.vue
index 0056c634..f2398bd6 100644
--- a/apps/frontend/src/pages/[type]/[id]/versions.vue
+++ b/apps/frontend/src/pages/[type]/[id]/versions.vue
@@ -1,7 +1,22 @@
 <template>
 	<section class="experimental-styles-within overflow-visible">
+		<CreateProjectVersionModal
+			v-if="currentMember"
+			ref="create-project-version-modal"
+		></CreateProjectVersionModal>
+
+		<ConfirmModal
+			v-if="currentMember"
+			ref="deleteVersionModal"
+			title="Are you sure you want to delete this version?"
+			description="This will remove this version forever (like really forever)."
+			:has-to-type="false"
+			proceed-label="Delete"
+			@proceed="deleteVersion()"
+		/>
+
 		<Admonition v-if="!hideVersionsAdmonition && currentMember" type="info" class="mb-4">
-			Managing project versions has moved! You can now add and edit versions in the
+			Creating and editing project versions can now be done directly from the
 			<NuxtLink to="settings/versions" class="font-medium text-blue hover:underline"
 				>project settings</NuxtLink
 			>.
@@ -43,24 +58,72 @@
 				(version) =>
 					`/${project.project_type}/${
 						project.slug ? project.slug : project.id
-					}/version/${encodeURI(version.displayUrlEnding)}`
+					}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`
 			"
+			:open-modal="currentMember ? () => handleOpenCreateVersionModal() : undefined"
 		>
 			<template #actions="{ version }">
 				<ButtonStyled circular type="transparent">
 					<a
 						v-tooltip="`Download`"
 						:href="getPrimaryFile(version).url"
-						class="group-hover:!bg-brand group-hover:[&>svg]:!text-brand-inverted"
+						class="hover:!bg-button-bg [&>svg]:!text-green"
 						aria-label="Download"
 						@click="emit('onDownload')"
 					>
 						<DownloadIcon aria-hidden="true" />
 					</a>
 				</ButtonStyled>
+				<ButtonStyled v-if="currentMember" circular type="transparent">
+					<OverflowMenu
+						v-tooltip="'Edit version'"
+						class="hover:!bg-button-bg"
+						:dropdown-id="`${baseDropdownId}-edit-${version.id}`"
+						:options="[
+							{
+								id: 'edit-details',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+							},
+							{
+								id: 'edit-changelog',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-changelog'),
+							},
+							{
+								id: 'edit-dependencies',
+								action: () =>
+									handleOpenEditVersionModal(version.id, project.id, 'add-dependencies'),
+								shown: project.project_type !== 'modpack',
+							},
+							{
+								id: 'edit-files',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
+							},
+						]"
+						aria-label="Edit version"
+					>
+						<EditIcon aria-hidden="true" />
+						<template #edit-files>
+							<FileIcon aria-hidden="true" />
+							Edit files
+						</template>
+						<template #edit-details>
+							<InfoIcon aria-hidden="true" />
+							Edit details
+						</template>
+						<template #edit-dependencies>
+							<BoxIcon aria-hidden="true" />
+							Edit dependencies
+						</template>
+						<template #edit-changelog>
+							<AlignLeftIcon aria-hidden="true" />
+							Edit changelog
+						</template>
+					</OverflowMenu>
+				</ButtonStyled>
 				<ButtonStyled circular type="transparent">
 					<OverflowMenu
-						class="group-hover:!bg-button-bg"
+						v-tooltip="'More options'"
+						class="hover:!bg-button-bg"
 						:dropdown-id="`${baseDropdownId}-${version.id}`"
 						:options="[
 							{
@@ -116,6 +179,38 @@
 								},
 								shown: flags.developerMode,
 							},
+							{ divider: true, shown: !!currentMember },
+							{
+								id: 'edit-details',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+								shown: !!currentMember,
+							},
+							{
+								id: 'edit-changelog',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-changelog'),
+								shown: !!currentMember,
+							},
+							{
+								id: 'edit-dependencies',
+								action: () =>
+									handleOpenEditVersionModal(version.id, project.id, 'add-dependencies'),
+								shown: !!currentMember && project.project_type !== 'modpack',
+							},
+							{
+								id: 'edit-files',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
+								shown: !!currentMember,
+							},
+							{
+								id: 'delete',
+								color: 'red',
+								hoverFilled: true,
+								action: () => {
+									selectedVersion = version.id
+									deleteVersionModal?.show()
+								},
+								shown: !!currentMember,
+							},
 						]"
 						aria-label="More options"
 					>
@@ -140,6 +235,26 @@
 							<ReportIcon aria-hidden="true" />
 							Report
 						</template>
+						<template #edit-files>
+							<FileIcon aria-hidden="true" />
+							Edit files
+						</template>
+						<template #edit-details>
+							<InfoIcon aria-hidden="true" />
+							Edit details
+						</template>
+						<template #edit-dependencies>
+							<BoxIcon aria-hidden="true" />
+							Edit dependencies
+						</template>
+						<template #edit-changelog>
+							<AlignLeftIcon aria-hidden="true" />
+							Edit changelog
+						</template>
+						<template #delete>
+							<TrashIcon aria-hidden="true" />
+							Delete
+						</template>
 						<template #copy-id>
 							<ClipboardCopyIcon aria-hidden="true" />
 							Copy ID
@@ -166,18 +281,35 @@
 
 <script setup>
 import {
+	AlignLeftIcon,
+	BoxIcon,
 	ClipboardCopyIcon,
 	DownloadIcon,
+	EditIcon,
 	ExternalIcon,
+	FileIcon,
+	InfoIcon,
 	LinkIcon,
 	MoreVerticalIcon,
 	ReportIcon,
 	SettingsIcon,
 	ShareIcon,
+	TrashIcon,
 } from '@modrinth/assets'
-import { Admonition, ButtonStyled, OverflowMenu, ProjectPageVersions } from '@modrinth/ui'
+import {
+	Admonition,
+	ButtonStyled,
+	ConfirmModal,
+	injectModrinthClient,
+	injectNotificationManager,
+	injectProjectPageContext,
+	OverflowMenu,
+	ProjectPageVersions,
+} from '@modrinth/ui'
 import { useLocalStorage } from '@vueuse/core'
+import { useTemplateRef } from 'vue'
 
+import CreateProjectVersionModal from '~/components/ui/create-project-version/CreateProjectVersionModal.vue'
 import { reportVersion } from '~/utils/report-helpers.ts'
 
 const props = defineProps({
@@ -205,6 +337,24 @@ const tags = useGeneratedState()
 const flags = useFeatureFlags()
 const auth = await useAuth()
 
+const client = injectModrinthClient()
+const { addNotification } = injectNotificationManager()
+const { refreshVersions } = injectProjectPageContext()
+
+const deleteVersionModal = ref()
+const selectedVersion = ref(null)
+const createProjectVersionModal = useTemplateRef('create-project-version-modal')
+
+const handleOpenCreateVersionModal = () => {
+	if (!props.currentMember) return
+	createProjectVersionModal.value?.openCreateVersionModal()
+}
+
+const handleOpenEditVersionModal = (versionId, projectId, stageId) => {
+	if (!props.currentMember) return
+	createProjectVersionModal.value?.openEditVersionModal(versionId, projectId, stageId)
+}
+
 const hideVersionsAdmonition = useLocalStorage(
 	'hideVersionsHasMovedAdmonition',
 	!props.versions.length,
@@ -223,4 +373,32 @@ function getPrimaryFile(version) {
 async function copyToClipboard(text) {
 	await navigator.clipboard.writeText(text)
 }
+
+async function deleteVersion() {
+	const id = selectedVersion.value
+	if (!id) return
+
+	startLoading()
+
+	try {
+		await client.labrinth.versions_v3.deleteVersion(id)
+
+		addNotification({
+			title: 'Version deleted',
+			text: 'The version has been successfully deleted.',
+			type: 'success',
+		})
+	} catch (err) {
+		addNotification({
+			title: 'An error occurred',
+			text: err.data ? err.data.description : err,
+			type: 'error',
+		})
+	}
+
+	refreshVersions()
+	selectedVersion.value = null
+
+	stopLoading()
+}
 </script>
diff --git a/apps/frontend/src/providers/version/manage-version-modal.ts b/apps/frontend/src/providers/version/manage-version-modal.ts
index 9e350adb..6bd04456 100644
--- a/apps/frontend/src/providers/version/manage-version-modal.ts
+++ b/apps/frontend/src/providers/version/manage-version-modal.ts
@@ -1,4 +1,5 @@
 import type { Labrinth } from '@modrinth/api-client'
+import { SaveIcon, SpinnerIcon } from '@modrinth/assets'
 import {
 	createContext,
 	injectModrinthClient,
@@ -6,6 +7,7 @@ import {
 	injectProjectPageContext,
 	type MultiStageModal,
 	resolveCtxFn,
+	type StageButtonConfig,
 	type StageConfigInput,
 } from '@modrinth/ui'
 import JSZip from 'jszip'
@@ -49,9 +51,9 @@ export type VersionStage =
 	| 'add-environment'
 	| 'add-dependencies'
 	| 'add-changelog'
-	| 'edit-loaders'
-	| 'edit-mc-versions'
-	| 'edit-environment'
+	| 'from-details-loaders'
+	| 'from-details-mc-versions'
+	| 'from-details-environment'
 
 export interface ManageVersionContextValue {
 	// State
@@ -75,6 +77,7 @@ export interface ManageVersionContextValue {
 
 	// Stage helpers
 	getNextLabel: (currentIndex?: number | null) => string
+	saveButtonConfig: () => StageButtonConfig
 
 	// Version methods
 	newDraftVersion: (projectId: string, version?: Labrinth.Versions.v3.DraftVersion | null) => void
@@ -264,7 +267,7 @@ export function createManageVersionContext(
 		if (noEnvironmentProject.value) version.environment = undefined
 
 		try {
-			await labrinth.versions_v3.createVersion(version, files)
+			await labrinth.versions_v3.createVersion(version, files, projectType.value ?? null)
 			modal.value?.hide()
 			addNotification({
 				title: 'Project version created',
@@ -380,6 +383,16 @@ export function createManageVersionContext(
 		}
 	}
 
+	const saveButtonConfig = (): StageButtonConfig => ({
+		label: 'Save changes',
+		icon: isSubmitting.value ? SpinnerIcon : SaveIcon,
+		iconPosition: 'before',
+		iconClass: isSubmitting.value ? 'animate-spin' : undefined,
+		color: 'green',
+		disabled: isSubmitting.value,
+		onClick: () => handleSaveVersionEdits(),
+	})
+
 	const contextValue: ManageVersionContextValue = {
 		// State
 		draftVersion,
@@ -402,6 +415,7 @@ export function createManageVersionContext(
 
 		// Stage helpers
 		getNextLabel,
+		saveButtonConfig,
 
 		// Methods
 		newDraftVersion,
diff --git a/apps/frontend/src/providers/version/stages/add-changelog.ts b/apps/frontend/src/providers/version/stages/add-changelog.ts
index abca4830..9d5252ab 100644
--- a/apps/frontend/src/providers/version/stages/add-changelog.ts
+++ b/apps/frontend/src/providers/version/stages/add-changelog.ts
@@ -1,4 +1,4 @@
-import { LeftArrowIcon, PlusIcon, SpinnerIcon } from '@modrinth/assets'
+import { LeftArrowIcon, PlusIcon, SaveIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import type { StageConfigInput } from '@modrinth/ui'
 import { markRaw } from 'vue'
 
@@ -10,14 +10,21 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 	id: 'add-changelog',
 	stageContent: markRaw(AddChangelogStage),
 	title: (ctx) => (ctx.editingVersion.value ? 'Edit changelog' : 'Add changelog'),
-	leftButtonConfig: (ctx) => ({
-		label: 'Back',
-		icon: LeftArrowIcon,
-		onClick: () => ctx.modal.value?.prevStage(),
-	}),
+	leftButtonConfig: (ctx) =>
+		ctx.editingVersion.value
+			? {
+					label: 'Cancel',
+					icon: XIcon,
+					onClick: () => ctx.modal.value?.hide(),
+				}
+			: {
+					label: 'Back',
+					icon: LeftArrowIcon,
+					onClick: () => ctx.modal.value?.prevStage(),
+				},
 	rightButtonConfig: (ctx) => ({
 		label: ctx.editingVersion.value ? 'Save changes' : 'Create version',
-		icon: ctx.isSubmitting.value ? SpinnerIcon : PlusIcon,
+		icon: ctx.isSubmitting.value ? SpinnerIcon : ctx.editingVersion.value ? SaveIcon : PlusIcon,
 		iconPosition: 'before',
 		iconClass: ctx.isSubmitting.value ? 'animate-spin' : undefined,
 		color: 'green',
@@ -25,4 +32,5 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 		onClick: () =>
 			ctx.editingVersion.value ? ctx.handleSaveVersionEdits() : ctx.handleCreateVersion(),
 	}),
+	nonProgressStage: (ctx) => ctx.editingVersion.value,
 }
diff --git a/apps/frontend/src/providers/version/stages/add-dependencies.ts b/apps/frontend/src/providers/version/stages/add-dependencies.ts
index 3b7ff6d0..c5f730df 100644
--- a/apps/frontend/src/providers/version/stages/add-dependencies.ts
+++ b/apps/frontend/src/providers/version/stages/add-dependencies.ts
@@ -1,4 +1,4 @@
-import { LeftArrowIcon, RightArrowIcon } from '@modrinth/assets'
+import { LeftArrowIcon, RightArrowIcon, XIcon } from '@modrinth/assets'
 import type { StageConfigInput } from '@modrinth/ui'
 import { markRaw } from 'vue'
 
@@ -11,15 +11,26 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 	stageContent: markRaw(AddDependenciesStage),
 	title: (ctx) => (ctx.editingVersion.value ? 'Edit dependencies' : 'Add dependencies'),
 	skip: (ctx) => ctx.projectType.value === 'modpack',
-	leftButtonConfig: (ctx) => ({
-		label: 'Back',
-		icon: LeftArrowIcon,
-		onClick: () => ctx.modal.value?.prevStage(),
-	}),
-	rightButtonConfig: (ctx) => ({
-		label: ctx.getNextLabel(),
-		icon: RightArrowIcon,
-		iconPosition: 'after',
-		onClick: () => ctx.modal.value?.nextStage(),
-	}),
+	leftButtonConfig: (ctx) =>
+		ctx.editingVersion.value
+			? {
+					label: 'Cancel',
+					icon: XIcon,
+					onClick: () => ctx.modal.value?.hide(),
+				}
+			: {
+					label: 'Back',
+					icon: LeftArrowIcon,
+					onClick: () => ctx.modal.value?.prevStage(),
+				},
+	rightButtonConfig: (ctx) =>
+		ctx.editingVersion.value
+			? ctx.saveButtonConfig()
+			: {
+					label: ctx.getNextLabel(),
+					icon: RightArrowIcon,
+					iconPosition: 'after',
+					onClick: () => ctx.modal.value?.nextStage(),
+				},
+	nonProgressStage: (ctx) => ctx.editingVersion.value,
 }
diff --git a/apps/frontend/src/providers/version/stages/add-details.ts b/apps/frontend/src/providers/version/stages/add-details.ts
index 095e7e42..51877005 100644
--- a/apps/frontend/src/providers/version/stages/add-details.ts
+++ b/apps/frontend/src/providers/version/stages/add-details.ts
@@ -1,4 +1,4 @@
-import { LeftArrowIcon, RightArrowIcon } from '@modrinth/assets'
+import { LeftArrowIcon, RightArrowIcon, XIcon } from '@modrinth/assets'
 import type { StageConfigInput } from '@modrinth/ui'
 import { markRaw } from 'vue'
 
@@ -10,16 +10,31 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 	id: 'add-details',
 	stageContent: markRaw(AddDetailsStage),
 	title: (ctx) => (ctx.editingVersion.value ? 'Edit details' : 'Add details'),
-	leftButtonConfig: (ctx) => ({
-		label: 'Back',
-		icon: LeftArrowIcon,
-		onClick: () => ctx.modal.value?.prevStage(),
-	}),
-	rightButtonConfig: (ctx) => ({
-		label: ctx.getNextLabel(),
-		icon: RightArrowIcon,
-		iconPosition: 'after',
-		disabled: ctx.draftVersion.value.version_number.trim().length === 0,
-		onClick: () => ctx.modal.value?.nextStage(),
-	}),
+	leftButtonConfig: (ctx) =>
+		ctx.editingVersion.value
+			? {
+					label: 'Cancel',
+					icon: XIcon,
+					onClick: () => ctx.modal.value?.hide(),
+				}
+			: {
+					label: 'Back',
+					icon: LeftArrowIcon,
+					onClick: () => ctx.modal.value?.prevStage(),
+				},
+	rightButtonConfig: (ctx) =>
+		ctx.editingVersion.value
+			? {
+					...ctx.saveButtonConfig(),
+					disabled:
+						ctx.draftVersion.value.version_number.trim().length === 0 || ctx.isSubmitting.value,
+				}
+			: {
+					label: ctx.getNextLabel(),
+					icon: RightArrowIcon,
+					iconPosition: 'after',
+					disabled: ctx.draftVersion.value.version_number.trim().length === 0,
+					onClick: () => ctx.modal.value?.nextStage(),
+				},
+	nonProgressStage: (ctx) => ctx.editingVersion.value,
 }
diff --git a/apps/frontend/src/providers/version/stages/add-environment.ts b/apps/frontend/src/providers/version/stages/add-environment.ts
index a953e016..0f5ad473 100644
--- a/apps/frontend/src/providers/version/stages/add-environment.ts
+++ b/apps/frontend/src/providers/version/stages/add-environment.ts
@@ -28,8 +28,8 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 	}),
 }
 
-export const editStageConfig: StageConfigInput<ManageVersionContextValue> = {
-	id: 'edit-environment',
+export const fromDetailsStageConfig: StageConfigInput<ManageVersionContextValue> = {
+	id: 'from-details-environment',
 	stageContent: markRaw(AddEnvironmentStage),
 	title: 'Edit environment',
 	nonProgressStage: true,
@@ -39,11 +39,17 @@ export const editStageConfig: StageConfigInput<ManageVersionContextValue> = {
 		disabled: !ctx.draftVersion.value.environment,
 		onClick: () => ctx.modal.value?.setStage('add-details'),
 	}),
-	rightButtonConfig: (ctx) => ({
-		label: ctx.getNextLabel(2),
-		icon: RightArrowIcon,
-		iconPosition: 'after',
-		disabled: !ctx.draftVersion.value.environment,
-		onClick: () => ctx.modal.value?.setStage(2),
-	}),
+	rightButtonConfig: (ctx) =>
+		ctx.editingVersion.value
+			? {
+					...ctx.saveButtonConfig(),
+					disabled: !ctx.draftVersion.value.environment,
+				}
+			: {
+					label: ctx.getNextLabel(2),
+					icon: RightArrowIcon,
+					iconPosition: 'after',
+					disabled: !ctx.draftVersion.value.environment,
+					onClick: () => ctx.modal.value?.setStage(2),
+				},
 }
diff --git a/apps/frontend/src/providers/version/stages/add-files.ts b/apps/frontend/src/providers/version/stages/add-files.ts
index 471484fd..9867dd57 100644
--- a/apps/frontend/src/providers/version/stages/add-files.ts
+++ b/apps/frontend/src/providers/version/stages/add-files.ts
@@ -15,6 +15,13 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 			ctx.filesToAdd.value.length !== 0 ||
 			(ctx.draftVersion.value.existing_files?.length ?? 0) !== 0
 
+		if (ctx.editingVersion.value)
+			return {
+				label: 'Cancel',
+				icon: XIcon,
+				onClick: () => ctx.modal.value?.hide(),
+			}
+
 		if (!hasFiles) return null
 
 		return {
@@ -28,6 +35,13 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 			ctx.filesToAdd.value.length !== 0 ||
 			(ctx.draftVersion.value.existing_files?.length ?? 0) !== 0
 
+		if (ctx.editingVersion.value)
+			return {
+				...ctx.saveButtonConfig(),
+				label: 'Save files',
+				disabled: ctx.isSubmitting.value,
+			}
+
 		if (!hasFiles) return null
 
 		return {
@@ -38,4 +52,5 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 			onClick: () => ctx.modal.value?.nextStage(),
 		}
 	},
+	nonProgressStage: (ctx) => ctx.editingVersion.value,
 }
diff --git a/apps/frontend/src/providers/version/stages/add-loaders.ts b/apps/frontend/src/providers/version/stages/add-loaders.ts
index c24d1b7a..d4f2f61f 100644
--- a/apps/frontend/src/providers/version/stages/add-loaders.ts
+++ b/apps/frontend/src/providers/version/stages/add-loaders.ts
@@ -28,8 +28,8 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 	}),
 }
 
-export const editStageConfig: StageConfigInput<ManageVersionContextValue> = {
-	id: 'edit-loaders',
+export const fromDetailsStageConfig: StageConfigInput<ManageVersionContextValue> = {
+	id: 'from-details-loaders',
 	stageContent: markRaw(AddLoadersStage),
 	title: 'Edit loaders',
 	nonProgressStage: true,
@@ -39,11 +39,17 @@ export const editStageConfig: StageConfigInput<ManageVersionContextValue> = {
 		disabled: ctx.draftVersion.value.loaders.length === 0,
 		onClick: () => ctx.modal.value?.setStage('add-details'),
 	}),
-	rightButtonConfig: (ctx) => ({
-		label: ctx.getNextLabel(2),
-		icon: RightArrowIcon,
-		iconPosition: 'after',
-		disabled: ctx.draftVersion.value.loaders.length === 0,
-		onClick: () => ctx.modal.value?.setStage(2),
-	}),
+	rightButtonConfig: (ctx) =>
+		ctx.editingVersion.value
+			? {
+					...ctx.saveButtonConfig(),
+					disabled: ctx.draftVersion.value.loaders.length === 0,
+				}
+			: {
+					label: ctx.getNextLabel(2),
+					icon: RightArrowIcon,
+					iconPosition: 'after',
+					disabled: ctx.draftVersion.value.loaders.length === 0,
+					onClick: () => ctx.modal.value?.setStage(2),
+				},
 }
diff --git a/apps/frontend/src/providers/version/stages/add-mc-versions.ts b/apps/frontend/src/providers/version/stages/add-mc-versions.ts
index b7444f4f..3e141e7f 100644
--- a/apps/frontend/src/providers/version/stages/add-mc-versions.ts
+++ b/apps/frontend/src/providers/version/stages/add-mc-versions.ts
@@ -26,8 +26,8 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
 	}),
 }
 
-export const editStageConfig: StageConfigInput<ManageVersionContextValue> = {
-	id: 'edit-mc-versions',
+export const fromDetailsStageConfig: StageConfigInput<ManageVersionContextValue> = {
+	id: 'from-details-mc-versions',
 	stageContent: markRaw(AddMcVersionsStage),
 	title: 'Edit game versions',
 	nonProgressStage: true,
@@ -37,11 +37,17 @@ export const editStageConfig: StageConfigInput<ManageVersionContextValue> = {
 		disabled: ctx.draftVersion.value.game_versions.length === 0,
 		onClick: () => ctx.modal.value?.setStage('add-details'),
 	}),
-	rightButtonConfig: (ctx) => ({
-		label: ctx.getNextLabel(2),
-		icon: RightArrowIcon,
-		iconPosition: 'after',
-		disabled: ctx.draftVersion.value.game_versions.length === 0,
-		onClick: () => ctx.modal.value?.setStage(2),
-	}),
+	rightButtonConfig: (ctx) =>
+		ctx.editingVersion.value
+			? {
+					...ctx.saveButtonConfig(),
+					disabled: ctx.draftVersion.value.game_versions.length === 0,
+				}
+			: {
+					label: ctx.getNextLabel(2),
+					icon: RightArrowIcon,
+					iconPosition: 'after',
+					disabled: ctx.draftVersion.value.game_versions.length === 0,
+					onClick: () => ctx.modal.value?.setStage(2),
+				},
 }
diff --git a/apps/frontend/src/providers/version/stages/index.ts b/apps/frontend/src/providers/version/stages/index.ts
index f3200b69..1e034ad1 100644
--- a/apps/frontend/src/providers/version/stages/index.ts
+++ b/apps/frontend/src/providers/version/stages/index.ts
@@ -2,16 +2,16 @@ import { stageConfig as addChangelogStageConfig } from './add-changelog'
 import { stageConfig as addDependenciesStageConfig } from './add-dependencies'
 import { stageConfig as addDetailsStageConfig } from './add-details'
 import {
-	editStageConfig as editEnvironmentStageConfig,
+	fromDetailsStageConfig as editEnvironmentStageConfig,
 	stageConfig as addEnvironmentStageConfig,
 } from './add-environment'
 import { stageConfig as addFilesStageConfig } from './add-files'
 import {
-	editStageConfig as editLoadersStageConfig,
+	fromDetailsStageConfig as editLoadersStageConfig,
 	stageConfig as addLoadersStageConfig,
 } from './add-loaders'
 import {
-	editStageConfig as editMcVersionsStageConfig,
+	fromDetailsStageConfig as editMcVersionsStageConfig,
 	stageConfig as addMcVersionsStageConfig,
 } from './add-mc-versions'
 
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index 238b6fdb..e728999e 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -477,6 +477,7 @@ export namespace Labrinth {
 				downloads: number
 				files: VersionFile[]
 				environment?: Labrinth.Projects.v3.Environment
+				mrpack_loaders?: string[]
 			}
 
 			export interface DraftVersionFile {
@@ -514,6 +515,7 @@ export namespace Labrinth {
 				primary_file?: string
 				file_types?: Record<string, Labrinth.Versions.v3.FileType | null>
 				environment?: Labrinth.Projects.v3.Environment
+				mrpack_loaders?: string[]
 			}
 
 			export type ModifyVersionRequest = Partial<
diff --git a/packages/api-client/src/modules/labrinth/versions/v3.ts b/packages/api-client/src/modules/labrinth/versions/v3.ts
index 5b929c46..bc942c6f 100644
--- a/packages/api-client/src/modules/labrinth/versions/v3.ts
+++ b/packages/api-client/src/modules/labrinth/versions/v3.ts
@@ -139,6 +139,7 @@ export class LabrinthVersionsV3Module extends AbstractModule {
 	public async createVersion(
 		draftVersion: Labrinth.Versions.v3.DraftVersion,
 		versionFiles: Labrinth.Versions.v3.DraftVersionFile[],
+		projectType: Labrinth.Projects.v2.ProjectType | null = null,
 	): Promise<Labrinth.Versions.v3.Version> {
 		const formData = new FormData()
 
@@ -164,13 +165,18 @@ export class LabrinthVersionsV3Module extends AbstractModule {
 			changelog: draftVersion.changelog,
 			dependencies: draftVersion.dependencies || [],
 			game_versions: draftVersion.game_versions,
-			loaders: draftVersion.loaders,
 			version_type: draftVersion.version_type,
 			featured: !!draftVersion.featured,
 			file_parts: fileParts,
 			file_types: fileTypeMap,
 			primary_file: fileParts[0],
 			environment: draftVersion.environment,
+			loaders: draftVersion.loaders,
+		}
+
+		if (projectType === 'modpack') {
+			data.mrpack_loaders = draftVersion.loaders
+			data.loaders = ['mrpack']
 		}
 
 		formData.append('data', JSON.stringify(data))
@@ -181,7 +187,7 @@ export class LabrinthVersionsV3Module extends AbstractModule {
 
 		const newVersion = await this.client.request<Labrinth.Versions.v3.Version>(`/version`, {
 			api: 'labrinth',
-			version: 2,
+			version: 3,
 			method: 'POST',
 			body: formData,
 			timeout: 120000,
@@ -190,10 +196,6 @@ export class LabrinthVersionsV3Module extends AbstractModule {
 			},
 		})
 
-		await this.modifyVersion(newVersion.id, {
-			environment: draftVersion.environment,
-		})
-
 		return newVersion
 	}
 
diff --git a/packages/ui/src/components/base/MultiStageModal.vue b/packages/ui/src/components/base/MultiStageModal.vue
index e0026d5f..730eaf8b 100644
--- a/packages/ui/src/components/base/MultiStageModal.vue
+++ b/packages/ui/src/components/base/MultiStageModal.vue
@@ -14,15 +14,13 @@
 		</template>
 
 		<progress
-			v-if="currentStage?.nonProgressStage !== true"
+			v-if="nonProgressStage !== true"
 			:value="progressValue"
 			max="100"
 			class="w-full h-1 appearance-none border-none absolute top-0 left-0"
 		></progress>
 
-		<div class="sm:w-[512px]">
-			<component :is="currentStage?.stageContent" />
-		</div>
+		<component :is="currentStage?.stageContent" />
 
 		<template #actions>
 			<div
@@ -81,7 +79,7 @@ export interface StageConfigInput<T> {
 	stageContent: Component
 	title: MaybeCtxFn<T, string>
 	skip?: MaybeCtxFn<T, boolean>
-	nonProgressStage?: boolean
+	nonProgressStage?: MaybeCtxFn<T, boolean>
 	leftButtonConfig: MaybeCtxFn<T, StageButtonConfig | null>
 	rightButtonConfig: MaybeCtxFn<T, StageButtonConfig | null>
 }
@@ -174,9 +172,15 @@ const rightButtonConfig = computed(() => {
 	return resolveCtxFn(stage.rightButtonConfig, props.context)
 })
 
+const nonProgressStage = computed(() => {
+	const stage = currentStage.value
+	if (!stage) return false
+	return resolveCtxFn(stage.nonProgressStage, props.context)
+})
+
 const progressValue = computed(() => {
 	const isProgressStage = (stage: StageConfigInput<T>) => {
-		if (stage.nonProgressStage) return false
+		if (resolveCtxFn(stage.nonProgressStage, props.context)) return false
 		const skip = stage.skip ? resolveCtxFn(stage.skip, props.context) : false
 		return !skip
 	}
diff --git a/packages/ui/src/components/project/ProjectPageVersions.vue b/packages/ui/src/components/project/ProjectPageVersions.vue
index 82190b24..8301ed5c 100644
--- a/packages/ui/src/components/project/ProjectPageVersions.vue
+++ b/packages/ui/src/components/project/ProjectPageVersions.vue
@@ -9,7 +9,7 @@
 				@update:query="updateQuery"
 			/>
 
-			<ButtonStyled v-if="openModal" color="green">
+			<ButtonStyled v-if="openModal" :color="createVersionButtonSecondary ? 'standard' : 'green'">
 				<button @click="openModal"><PlusIcon /> Create version</button>
 			</ButtonStyled>
 
@@ -238,6 +238,7 @@ const props = withDefaults(
 		gameVersions: GameVersionTag[]
 		versionLink?: (version: Version) => string
 		openModal?: () => void
+		createVersionButtonSecondary?: boolean
 	}>(),
 	{
 		baseId: undefined,