Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Implement review feedback

spanish-translations
ancientmarinerdev 2023-06-28 20:27:55 +01:00
parent eded3b8dc4
commit 39b614a038
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CONTRIBUTING.md
View File

@ -222,10 +222,12 @@ they have made their donation Incognito).
* Create a pull request to get your changes merged into master * Create a pull request to get your changes merged into master
* It is important that conflicts are resolved prior to merging the pull * It is important that conflicts are resolved prior to merging the pull
request. request.
* We update our branches via rebasing. Please avoid unless it's the only * We update our branches via rebasing. Please avoid merging master into
way you can resolve a conflict. We can rebase branches from the GUI if your branch unless it's the only way you can resolve a conflict. We can
the user has not merged master into the branch. rebase branches from the GUI if the user has not merged master into the
* After the pull request got merged, you can delete the branch branch.
* After the pull request got merged, you can delete the branch if the
merger hasn't done this already.
### Discuss first ### Discuss first
If you feel like a problem needs to fixed or you want to make a new If you feel like a problem needs to fixed or you want to make a new

1
CREDITS.md
View File

@ -159,6 +159,7 @@
* tobyplowy * tobyplowy
* epCode * epCode
* Faerraven / Michieal * Faerraven / Michieal
* SumianVoice
## Textures ## Textures
* XSSheep * XSSheep