diff options
| author | Aikar <[email protected]> | 2016-03-28 23:59:04 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2016-03-28 23:59:19 -0400 |
| commit | 08c9934f83c4b85e3039ab965186ae6daeea7370 (patch) | |
| tree | e4032dcdfc1a5822819fdfd31ad5cbfb85230c79 /README.md | |
| parent | ebe7176b2e257dbfe2e8eb6e5d9bec9b729abda5 (diff) | |
| download | Paper-08c9934f83c4b85e3039ab965186ae6daeea7370.tar.gz Paper-08c9934f83c4b85e3039ab965186ae6daeea7370.zip | |
update README for PR instructions
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 32 |
1 files changed, 27 insertions, 5 deletions
@@ -6,26 +6,48 @@ High performance Spigot fork that aims to fix gameplay and mechanics inconsisten [IRC Support and Project Discussion](http://irc.spi.gt/iris/?channels=PaperSpigot) - +Documentation +------ +Access the paper docs here: [paper.readthedocs.org](https://paper.readthedocs.org/) How To (Server Admins) ------ +Paperclip is a jar file that you can download and run just like a normal jar file. + Download a copy of Paperclip.jar from our buildserver here: https://ci.destroystokyo.com/job/PaperSpigot/ Run the Paperclip jar directly from your server. Just like old times -Paperclip requires **Java 8** or above. +Paper requires [**Java 8**](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) or above. - -How To (Compiling From Source) +How To (Compiling Jar From Source) ------ To compile Paper, you need JDK 8, maven, and an internet connection. -Clone this repo, run ./build.sh --jar from *bash*, get files. +Clone this repo, run `./build.sh --jar` from *bash*, get files. Leave off --jar if you only wish to resync your checkout and not create a paperclip jar file just yet. +How To (Pull Request) +------ +Clone this repo, run `./build.sh` from *bash*, get files. + +Load Paper-API and Paper-Server into your IDE, make changes. + +Commit your changes in each retrospective folder. + +If you are editing a previous patch, commit, and then use `git rebase -i upstream/upstream` +and then move your commit line to the commit you are editing and use code "f" or "s" + +Once your commit is in place, cd back into Paper folder, and type `./rebuildPatches.sh` + +You should now see either a new patch or an edited patch in your `git status` + +Now, write a commit message for the patch files. For new patches, you can just repeat the commit message used in the patch commit itself, but if editing, explain what the change to the patch is. + +now `git checkout -b someBranchName`, then `git remote add myorigin [email protected]:myname/Paper` and `git push myorigin someBranchName` and then proceed to PR. + Special Thanks To: ------------- |