Skip to content

Modjams - #14

Open
Villagers654 wants to merge 275 commits into
developfrom
modjam
Open

Modjams#14
Villagers654 wants to merge 275 commits into
developfrom
modjam

Conversation

@Villagers654

Copy link
Copy Markdown
Collaborator

No description provided.

@Villagers654 Villagers654 changed the title Very initial modjam work Modjams Feb 20, 2026
@Villagers654
Villagers654 marked this pull request as draft February 20, 2026 08:52
@Villagers654
Villagers654 marked this pull request as ready for review March 13, 2026 00:15
# Conflicts:
#	backend/src/main/java/net/modtale/ModtaleApplication.java
#	backend/src/main/java/net/modtale/controller/user/UserController.java
#	backend/src/main/java/net/modtale/model/dto/ModDTO.java
#	backend/src/main/java/net/modtale/model/resources/Mod.java
#	backend/src/main/java/net/modtale/service/resources/ModService.java
#	frontend/src/components/Navbar.tsx
#	frontend/src/components/resources/upload/ProjectBuilder.tsx
#	frontend/src/pages/[...all].astro
#	frontend/src/react-pages/resources/ModDetail.tsx
#	frontend/src/react-pages/user/Dashboard.tsx
#	frontend/src/types.ts

@ItsNeil17 ItsNeil17 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

# Conflicts:
#	backend/src/main/java/net/modtale/controller/system/SitemapController.java
#	backend/src/main/resources/application.properties
#	backend/src/test/java/net/modtale/controller/system/SitemapControllerTest.java
#	frontend/src/App.tsx
#	frontend/src/modules/project/components/VersionFields.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants