Skip to content

[pull] master from ElevatedDev:master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[pull] master from ElevatedDev:master #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
297fbad
Update and rename README.md to Updating dead dropbox link
funkemunky Oct 16, 2024
08263ef
Rename Updating dead dropbox link to README.md
funkemunky Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Here we will lay out all the important information you need to know getting setu
1) Fork Frequency
2) Get your git environment setup on your computer.
3) Load the directory into your project as Maven.
4) You will find that the spigot dependency is missing. You can run BuildTools with a script Dawson made (https://www.dropbox.com/s/oj3v6arxfpfcb96/BuildTools.zip?dl=0). We have to do this because of licensing issues. However, it is really simple to use and there are instructions inside the ZIP file.
4) You will find that the spigot dependency is missing. You can run BuildTools with a script Dawson made (https://www.dropbox.com/scl/fi/ar6220y4sgzg5gydsxl2j/BuildTools.zip?rlkey=gqiseh4yoptopol1jk4o9hdfl&st=j9tu8o2v&dl=0). We have to do this because of licensing issues. However, it is really simple to use and there are instructions inside the ZIP file.

### Important Git Conventions
Always make sure that your master is up to date with the Frequency one. **NEVER** work on master. When making a feature, format the branch based on master with "feature/{name}" or "bugfix/{name}". Then you can submit the branch in a pull request. We will not be merging master to master. The whole point of this is to help prevent merging conflicts and allow for a cleaner git history.
Expand Down
Loading