Fix conflicts

This commit is contained in:
Liriosha
2026-03-20 12:22:53 -04:00
41 changed files with 37 additions and 3253 deletions

View File

@@ -4,10 +4,6 @@ on:
push:
branches: ["dev"]
paths:
- "4J.Input/**"
- "4J.Profile/**"
- "4J.Render/**"
- "4J.Storage/**"
- "Minecraft.Assets/**"
- "Minecraft.Client/**"
- "Minecraft.World/**"
@@ -15,6 +11,8 @@ on:
jobs:
build:
permissions:
contents: write
runs-on: ubuntu-latest
steps: