search

rfresh2 / XaeroPlus

Xaero WorldMap / Minimap Extra Features
MIT License
86 stars 25 forks source link

Fabric 1.20.2 #100

Closed godkyo98 closed 6 months ago

rfresh2 commented 6 months ago

Not sure what you've done to the git tree here lol

Just make 1 PR to fabric-1.20.1.

Sync your fork with current XaeroPlus repo. Then make a branch from fabric-1.20.1 and add your commit to it and PR that.

I'll handle forward committing it to all the other versions.

godkyo98 commented 6 months ago

I don't know if I did something wrong somewhere. I just downloaded the en_us version, translated it into vi_vn, and then uploaded it .At first it was in patch 1, I felt it was a bit wrong so I changed it to 1.20.1. I don't know if that bothers you or not.

Vào 05:50 CN, 14 Th1, 2024 rfresh2 @.***> đã viết:

Not sure what you've done to the git tree here lol

Just make 1 PR to fabric-1.20.1.

Sync your fork with current XaeroPlus repo. Then make a branch from fabric-1.20.1 and add your commit to it and PR that.

I'll handle forward committing it to all the other versions.

— Reply to this email directly, view it on GitHub https://github.com/rfresh2/XaeroPlus/pull/100#issuecomment-1890787190, or unsubscribe https://github.com/notifications/unsubscribe-auth/AK4ECR5WLGDCVEGZNFBP4ILYOMFUBAVCNFSM6AAAAABBZT3IW6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQOJQG44DOMJZGA . You are receiving this because you authored the thread.Message ID: @.***>

rfresh2 commented 6 months ago

I don't know if that bothers you or not.

Yeah i can't merge this as is. just take a look at the git diff here https://github.com/rfresh2/XaeroPlus/pull/100/files

you need to cancel all these PR's and resubmit one doing the steps as I described.

If you don't know how to do this I'll just make the commit for you if you send me the lang file on discord

godkyo98 commented 6 months ago

So what can I delete and redo? If necessary, I will send you via discord for convenience

Vào 06:42 CN, 14 Th1, 2024 rfresh2 @.***> đã viết:

I don't know if that bothers you or not.

Yeah i can't merge this as is. just take a look at the git diff here https://github.com/rfresh2/XaeroPlus/pull/100/files

you need to cancel all these PR's and resubmit one doing the steps as I described.

If you don't know how to do this I'll just make the commit for you if you send me the lang file on discord

— Reply to this email directly, view it on GitHub https://github.com/rfresh2/XaeroPlus/pull/100#issuecomment-1890796056, or unsubscribe https://github.com/notifications/unsubscribe-auth/AK4ECR4CSPKXDILLUKQXBDDYOMLVRAVCNFSM6AAAAABBZT3IW6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQOJQG44TMMBVGY . You are receiving this because you authored the thread.Message ID: @.***>

rfresh2 commented 6 months ago

Here's an example of what I'd expect you to do in CLI commands:

git checkout fabric-1.20.1 git reset origin/fabric-1.20.1 --hard \<add your lang file> git add . git commit -m "<commit msg here>" git push -f \<create PR on github>

godkyo98 commented 6 months ago

Hello admin Now I have made it to this step. What should I do next, admin? [cid:2d366bbf-8e56-4620-a4f3-54a121c1e84e]

Từ: rfresh2 @.> Đã gửi: 14 Tháng Giêng 2024 07:05 Đến: rfresh2/XaeroPlus @.> Cc: godkyo98 @.>; Author @.> Chủ đề: Re: [rfresh2/XaeroPlus] Fabric 1.20.2 (PR #100)

Here's an example of what I'd expect you to do in CLI commands:

git checkout fabric-1.20.1 git reset origin/fabric-1.20.1 --hard

git add . git commit -m "" git push -f — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you authored the thread.Message ID: ***@***.***>
godkyo98 commented 6 months ago

Admin, please read the email. If you need it, I'll send it over Imgur: The magic of the Internethttps://imgur.com/a/86mKBi0

Từ: kyo kyo @.> Đã gửi: 14 Tháng Giêng 2024 22:51 Đến: rfresh2/XaeroPlus @.>; rfresh2/XaeroPlus @.> Cc: Author @.> Chủ đề: Trả lời: [rfresh2/XaeroPlus] Fabric 1.20.2 (PR #100)

Hello admin Now I have made it to this step. What should I do next, admin? [cid:2d366bbf-8e56-4620-a4f3-54a121c1e84e]

Từ: rfresh2 @.> Đã gửi: 14 Tháng Giêng 2024 07:05 Đến: rfresh2/XaeroPlus @.> Cc: godkyo98 @.>; Author @.> Chủ đề: Re: [rfresh2/XaeroPlus] Fabric 1.20.2 (PR #100)

Here's an example of what I'd expect you to do in CLI commands:

git checkout fabric-1.20.1 git reset origin/fabric-1.20.1 --hard

git add . git commit -m "" git push -f — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you authored the thread.Message ID: ***@***.***>
rfresh2 commented 6 months ago

eh I tried fixing your branch but github isn't letting me go the full way

Create a new PR from your branch: https://github.com/rfresh2/XaeroPlus/compare/fabric-1.20.1...godkyo98:XaeroPlus:fabric-1.20.1

Select the base branch as fabric-1.20.1