Merge branch 'develop' into main

M1zz · Jul 30, 2022 · 51159e8 · 51159e8
2 parents 02f653d + b914d34
commit 51159e8
Show file tree

Hide file tree

Showing 210 changed files with 1,195 additions and 959 deletions.
diff --git a/LullabyRecipe.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/LullabyRecipe.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...eproj/project.xcworkspace/xcuserdata/hyunholee.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/hyunholee.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...proj/project.xcworkspace/xcuserdata/kim-yeonho.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/kim-yeonho.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...codeproj/project.xcworkspace/xcuserdata/monica.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/monica.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...codeproj/project.xcworkspace/xcuserdata/moonjs.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/moonjs.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/LullabyRecipe.xcodeproj/xcshareddata/xcschemes/LullabyRecipe.xcscheme b/LullabyRecipe.xcodeproj/xcshareddata/xcschemes/LullabyRecipe.xcscheme
diff --git a/...abyRecipe.xcodeproj/xcuserdata/hyunholee.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...abyRecipe.xcodeproj/xcuserdata/hyunholee.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/LullabyRecipe.xcodeproj/xcuserdata/hyunholee.xcuserdatad/xcschemes/xcschememanagement.plist b/LullabyRecipe.xcodeproj/xcuserdata/hyunholee.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/LullabyRecipe.xcodeproj/xcuserdata/kim-yeonho.xcuserdatad/xcschemes/xcschememanagement.plist b/LullabyRecipe.xcodeproj/xcuserdata/kim-yeonho.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/LullabyRecipe.xcodeproj/xcuserdata/monica.xcuserdatad/xcschemes/xcschememanagement.plist b/LullabyRecipe.xcodeproj/xcuserdata/monica.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/LullabyRecipe/Model/Recipe.swift b/LullabyRecipe/Model/Recipe.swift
diff --git a/LullabyRecipe/Views/Kitchen/CustomAlert.swift b/LullabyRecipe/Views/Kitchen/CustomAlert.swift
diff --git a/LullabyRecipe/Views/WhiteTitleText.swift b/LullabyRecipe/Views/WhiteTitleText.swift