sf-inc / music_control

More control over Minecraft musics!
https://modrinth.com/mod/music-control
MIT License
6 stars 6 forks source link

Add 1.20 contents' translation, add Japanese translation and optimize some display logics #34

Closed BillStark001 closed 9 months ago

BillStark001 commented 12 months ago

Now the mod fetches the biome name from official language files

charlyb01 commented 11 months ago

Hello and thank you for your new PR! =)
I will do a proper review later, but I can already ask you to split your changes in different commits in order to make it easier to read and keep a clean git history.

BillStark001 commented 10 months ago

OMG! Sorry, I just got overwhelmed by my study and work and I didn't see your reply until now... I have already given you access to change I think :D Besides, I am not really familiar to editing commit history. If you can help me on it (like what command should I use) maybe I can find time to help to improve my commit.

charlyb01 commented 10 months ago

Basically, the command to know is git rebase -i HEAD~n, where you replace n by the number of commit you made. The -i option allows you to interactively rebase: this will open your configured editor for git (you can change it if you don't like the default one) and print you your n last commits prefixed with tags.

You can find more details on the net but here is an over simplified example:

Example * you made 2 commits * you want to replace typo you added with commit 1 * you fix the typo, and commit it * now you have a third commit * run the `git rebase -i HEAD~3` command * it opens your text editor with ``` pick afed0a your first commit pick d26d1c your second commit pick bff10e your third commit ``` * replace it by moving lines and editing prefixes only ``` reword afed0a your first commit fixup bff10e your third commit pick d26d1c your second commit ``` * close the editor * the editor will reopen with your first commit message because of the reword prefix: it allows you to edit the commit message as you may have change what's inside. save and exit when you're done * the command will finish running, and the fixup will apply, which means that the third commit, placed on the second position, will be merged into the previous commit, which is the first one. After that, your history will have only two commits. Be aware that the fixup may fail if your changes are conflicting, you can fix the conflict or abort the rebase

I can help you with that if you're not familiar with it. I'll see whenever I have time

charlyb01 commented 9 months ago

Well once again I've made a mistake, my bad. Next time please don't do your changes on the main branch, but on a dedicated branch, this will avoid me doing another mistake =D
Will merge it on master directly so