Merge conflict

Author: emyfops

common/src/main/kotlin/com/lambda/util/FolderRegister.kt

@@ -52,7 +52,7 @@ object FolderRegister : Loadable {
     val maps: Path = lambda.resolve("maps")
 
     override fun load(): String {
-        val folders = listOf(lambda, config, packetLogs, replay, cache, structure)
+        val folders = listOf(lambda, config, packetLogs, replay, cache, capes, structure, maps)
         val createdFolders = folders.mapNotNull {
             if (it.notExists()) {
                 it.createDirectories()

common/src/main/resources/lambda.mixins.common.json

@@ -14,6 +14,7 @@
     "entity.FireworkRocketEntityMixin",
     "entity.LivingEntityMixin",
     "entity.PlayerEntityMixin",
+    "entity.PlayerInventoryMixin",
     "input.KeyBindingMixin",
     "input.KeyboardMixin",
     "input.MouseMixin",