NataliaTheDrowned2/MDL_FriendlyDrowned_MCPE
NataliaTheDrowned2/MDL_FriendlyDrowned_MCPE
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Activity

merge README.MD (and residually other changes) to rewrite #5

Merged
NataliaTheDrowned2 merged 19 commits from mistress into rewrite 2026-04-28 16:03:24 +02:00
Conversation 2 Commits 19 Files changed 2 +35 -8
hankskyjames777 commented 2026-04-26 18:15:02 +02:00
Collaborator
Copy link
No description provided. 
Signed-off-by: hankskyjames777 <iamjuanz30312@gmail.com>
Reviewed-on: hankskyjames777/MDL_FriendlyDrowned_MCPE#1
Reviewed-by: hankskyjames777 <iamjuanz30312@gmail.com>
Co-authored-by: NintenHero <mchinrichs@gmail.com>
Co-committed-by: NintenHero <mchinrichs@gmail.com>
Reviewed-on: #2
Reviewed-by: NataliaTheDrowned2 <nataliathedrowned2@git.theclashfruit.me>
Co-authored-by: hankskyjames777 <iamjuanz30312@gmail.com>
Co-committed-by: hankskyjames777 <iamjuanz30312@gmail.com>
closes #3
fixes #3

Reviewed-on: #4
Reviewed-by: NataliaTheDrowned2 <nataliathedrowned2@git.theclashfruit.me>
Co-authored-by: hankskyjames777 <iamjuanz30312@gmail.com>
Co-committed-by: hankskyjames777 <iamjuanz30312@gmail.com>
hankskyjames777 changed title from WIP: merge README.MD (and resifually other changes) to rewrite to WIP: merge README.MD (and residually other changes) to rewrite 2026-04-26 18:15:21 +02:00
NataliaTheDrowned2 commented 2026-04-28 15:40:30 +02:00
Owner
Copy link

I think you can now delete the old README since the markdown version is more thoroughly designed

I think you can now delete the old `README` since the markdown version is more thoroughly designed
👍 1 
readd README.TXT
hankskyjames777 referenced this pull request from a commit 2026-04-28 15:59:13 +02:00
re-delete per #5
hankskyjames777 changed title from WIP: merge README.MD (and residually other changes) to rewrite to merge README.MD (and residually other changes) to rewrite 2026-04-28 16:00:29 +02:00
NataliaTheDrowned2 approved these changes 2026-04-28 16:02:58 +02:00
NataliaTheDrowned2 left a comment
Owner
Copy link

Looks good to me - deleting the file on both branches solved the merge conflict

FYI: he ended up deleting the README.TXT file which was causing the merge conflict as it was now useless in favor of the markdown version

Looks good to me - deleting the file on both branches solved the merge conflict _____ FYI: he ended up deleting the README.TXT file which was causing the merge conflict as it was now useless in favor of the markdown version
NataliaTheDrowned2 locked as Resolved and limited conversation to collaborators 2026-04-28 16:10:30 +02:00
This discussion has been locked. Commenting is limited to contributors.
Reviewers
No reviewers
NataliaTheDrowned2
Labels
Clear labels   
Compat
Breaking
Breaking change that won't be backward compatible

  
Fix Review
Confirmed
The fix is confirmed

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

  
Type
Bug
Something is not working

  
Type
Documentation
Documentation changes

  
Type
Enhancement
Improve existing functionality

  
Type
Feature
New functionality

  
Type
Security
This is security issue

  
Type
Testing
Issue or pull request related to testing

No labels
Compat
Breaking
Fix Review
Confirmed
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Type
Bug
Type
Documentation
Type
Enhancement
Type
Feature
Type
Security
Type
Testing
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
NataliaTheDrowned2/MDL_FriendlyDrowned_MCPE!5
No description provided.