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
+5 -4
View File
@@ -49,10 +49,11 @@ if host_machine.system() == 'linux'
]
endif
subdir('4J.Render')
subdir('4J.Input')
subdir('4J.Profile')
subdir('4J.Storage')
render_dep = dependency('4j-render', fallback: ['4jlibs', 'render_dep'])
input_dep = dependency('4j-input', fallback: ['4jlibs', 'input_dep'])
profile_dep = dependency('4j-profile', fallback: ['4jlibs', 'profile_dep'])
storage_dep = dependency('4j-storage', fallback: ['4jlibs', 'storage_dep'])
subdir('Minecraft.Assets')
subdir('Minecraft.World')
subdir('Minecraft.Client')