Skip to content

머지 충돌 해결 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gogumalatte wants to merge 7 commits into
base: main
Choose a base branch
from
Open

머지 충돌 해결 #45

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e07c336
feat: 집행검 옵션 변경
gogumalatte May 29, 2025
3ec03b4
feat: 팀장님이 변경한 내용
gogumalatte May 29, 2025
51eca41
feat: 팀장님이 변경한 내용2
gogumalatte May 29, 2025
7561a3a
Merge pull request #1 from gogumalatte/#2
gogumalatte May 29, 2025
ed67f55
feat: 내가 수정
gogumalatte May 29, 2025
3bcab1a
Merge pull request #2 from gogumalatte/feature/update-execution-sword
gogumalatte May 29, 2025
31863ff
Merge branch 'main' into main
gogumalatte May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions items.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

## 리니지M 아이템 목록
### 데스나이트의 검
![데스나이트의 검](https://static.inven.co.kr/image_2011/game/item/lineage/weapon/Death_Knight_Sword.png)
Expand All @@ -24,7 +25,7 @@
![마법사의 모자](https://static.inven.co.kr/image_2011/game/item/lineage/armor/WizardHat.png)
- **종류:** 방어구(모자)
- **주요효과:** 마법력 상승, 마나 회복력 증가
- **주요 능력치:** SP +2, MP 회복 +2
- **주요 능력치:** SP +3, MP 회복 +3
- **드랍률:** 낮음 (보스/이벤트/상점)

### 용의 심장
Expand All @@ -46,7 +47,7 @@
- **종류:** 소모품
- **주요효과:** 방어구 강화 성공률 증가
- **방어력:** 해당 없음
- **드랍률:** 낮음 (보스/이벤트/상점)
- **드랍률:** 높음 (보스/이벤트/상점)

### 반지 오브 조력자
![반지 오브 조력자](https://static.inven.co.kr/image_2011/game/item/lineage/accessory/HelperRing.png)
Expand All @@ -58,4 +59,4 @@
### 바포메트의 뿔
![바포메트의 뿔](https://static.inven.co.kr/image_2011/game/item/lineage/quest/BaphometHorn.png)
- **종류:** 퀘스트/재료
- **주요효과:** 특수 장비 제작, 일부 스킬
- **주요효과:** 특수 장비 제작, 일부 스킬