typos

Raekye committed 2013-04-28 14:03:56 -07:00
1 parent a778751ef2
commit 8d271f5df0
1 file changed
+3 -3
+3 -3
@@ -2,7 +2,7 @@ Prerequisites: Eclipse (3.7 or better is probably good), Ant 1.8.2+ (the java bu
1. Fork the MinecraftForge repository
2. Clone your repository, and make sure you initialize the FML submodule (`git clone --recursive [your URL]`)
3. If you're on Windows, run `.\fml\python\python_fml.exe setup.py` from your Forge root. If you're on Mac or Linux, you probably already have Python installed and can do `python setup.py`. This also sets up FML
3. Run "setup.py". If you're on Windows, do `.\fml\python\python_fml.exe setup.py` from your Forge root. If you're on Mac or Linux, you probably already have Python installed and can do `python setup.py`. This also sets up FML
4. You will have an "eclipse" folder in your Forge root. There will be two projects - "Clean" and "Forge". Make your changes to "Forge"
- Make sure you run and test your changes
@@ -14,5 +14,5 @@ Prerequisites: Eclipse (3.7 or better is probably good), Ant 1.8.2+ (the java bu
- Indent your code properly, and follow the conventions (take a look at other classes and read the code before editing). Space instead of tabs, open braces on a new line, etc.
- To update your repo to latest code from the official repository:
1. If it's the first time, add a remote for the official repo (`git remote add upstream [email protected]:MinecraftForge/MinecraftForge.git`)
2. Get the updates (`git fetch upstream` or `git fetch upstream master`), and make sure you're on master (`git checkout master`)
3. If you don't want to rewrite your history (e.g. others have cloned your repository), do a merge (`git merge upstream/master`). **For keeping pull requests as clean as possible, do a rebase** (`git rebase origin/master`). Git may reject your push the first time after each rebase and you'll have to do `git push -f origin master` (or `git push origin master --force`).
2. Get the updates (`git fetch upstream`), and make sure you're on master (`git checkout master`)
3. If you don't want to rewrite your history (e.g. others have cloned your repository), do a merge (`git merge upstream/master`). **For keeping pull requests as clean as possible, do a rebase** (`git rebase upstream/master`). Git may reject your push the first time after each rebase and you'll have to do `git push -f origin master` (or `git push origin master --force`).