-
Notifications
You must be signed in to change notification settings - Fork 652
phonixblocks #2112
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
Open
WolfPhonix
wants to merge
35
commits into
LabyMod:master
Choose a base branch
from
WolfPhonix: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.
+26
−3
Open
phonixblocks #2112
Changes from all commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
16e84de
Create manifest.json
WolfPhonix 498c4aa
Update manifest.json
WolfPhonix 7567dbb
Add files via upload
WolfPhonix 6781359
Add files via upload
WolfPhonix 304bb27
Add files via upload
WolfPhonix d8dbdcf
Add files via upload
WolfPhonix ffdcb6e
Delete background.png
WolfPhonix d0930ce
Delete [email protected]
WolfPhonix 1f4b6e9
Delete icon.png
WolfPhonix e4de004
Delete [email protected]
WolfPhonix 95ca762
Delete logo.png
WolfPhonix 0c17588
Delete [email protected]
WolfPhonix 6c8c71b
Merge branch 'LabyMod:master' into master
WolfPhonix 0026ced
SkibidiCraft
WolfPhonix d019ce5
SkibidiCraft
WolfPhonix cddb0bb
Update SkibidiCraft
WolfPhonix fe8d7fb
Create manifest.json
WolfPhonix c2cefe2
Add files via upload
WolfPhonix 1ddc47e
Merge branch 'LabyMod:master' into master
WolfPhonix 7b97d1e
Delete minecraft_servers/SkibidiCraft
WolfPhonix 52e571b
Delete Skibidicraft directory
WolfPhonix 1b816bc
Delete minecraft_servers/phonixblocks/background.png
WolfPhonix 3c9392c
Delete minecraft_servers/phonixblocks/[email protected]
WolfPhonix 49093bf
Update manifest.json
WolfPhonix 6e19b40
Add files via upload
WolfPhonix faf60f5
Delete minecraft_servers/phonixblocks/[email protected]
WolfPhonix 9c90c90
Add files via upload
WolfPhonix 0db8aac
Delete minecraft_servers/phonixblocks/[email protected]
WolfPhonix 86e5cdc
Add files via upload
WolfPhonix 8d482ea
Delete minecraft_servers/phonixblocks/[email protected]
WolfPhonix d8fe5bb
Add files via upload
WolfPhonix 982d796
Delete SkibidiCraft
WolfPhonix ab559ba
Merge branch 'LabyMod:master' into master
WolfPhonix 6365f35
Update manifest.json
WolfPhonix 4826fd3
Update manifest.json
WolfPhonix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Compress image |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,11 +7,34 @@ | |
], | ||
"social": { | ||
"web": "https://phonixblocks.de", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not reachable |
||
"web_support": "https://forum.phonixblocks.de", | ||
"discord": "https://discord.gg/cTSyECkTWs" | ||
"discord": "https://discord.gg/PwjQzAC7C8" | ||
|
||
}, | ||
"gamemodes": { | ||
"phonix-insel": { | ||
"name": "Phonix-Insel", | ||
"color": "#ff6121" | ||
}, | ||
"survival": { | ||
"name": "Survival", | ||
"color": "#ADD8E6" | ||
}, | ||
"phonixsmp": { | ||
"name": "PhonixSMP", | ||
"color": "#ff6121" | ||
}, | ||
"discord": { | ||
"server_id": 1233770982926454905, | ||
"server_id": 1233770982926454800, | ||
"rename_to_minecraft_name": false | ||
}, | ||
"brand": { | ||
"primary": "#ff6121", | ||
"background": "#e14d19", | ||
"text": "#FFFFFF" | ||
}, | ||
"location": { | ||
"city": "Nürnberg", | ||
"country": "Germany", | ||
"country_code": "DE" | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Compress image