forked from Civcraft/Citadel
-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
EDIT: Wrong pull request #5
Open
iNko97
wants to merge
323
commits into
ProgrammerDan:master
Choose a base branch
from
DevotedMC:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thanks for your contribution @ProgrammerDan and @Maxopoly! This commit is untested, but it compiles.
Using Github web interface :dice:
Rip out BetterShards and Mercury
Fix spammy debug message
Don't turn /ctf & /ctr off when attempting to switch reinforcement groups
Make /cte idempotent (non-stateful)
Add hover messages to /ctf, /ctr, and /cti
Fix an NPE when destroying blocks of non-existent groups
Fix an error message
Fix compilation error
Merge awoo's changes from upstream
Theres always one...
Add Sweet berry bushes
Stop explosions breaking reinforced hanging entities
Add isOccluding check to acid blocks
Show decay on /cti
Attempt to drop items safely when acid blocking chests
Show decay for players with group acess
Various block check fixes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ignore I had no idea what I was doing, first time creating a pull request this was.