Skip to content

Commit

Permalink
Merge branch 'staging' into refactor/vue-user-frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
Katrix committed Oct 17, 2023
2 parents 1f6b354 + 943a6dd commit 00499f5
Show file tree
Hide file tree
Showing 19 changed files with 675 additions and 155 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up NodeJS
uses: actions/setup-node@v3
with:
node-version: 16.16.0

- name: Set up JDK
uses: actions/setup-java@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion ore/conf/messages
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ general.docs = Docs
general.javadocs = Javadocs
general.plugins = Plugins
general.getsponge = Downloads
general.irc = Chat
general.discord = Discord
general.edit = Edit
general.cancel = Cancel
general.save = Save
Expand Down
35 changes: 23 additions & 12 deletions ore/conf/ore-default-settings.conf
Original file line number Diff line number Diff line change
Expand Up @@ -298,29 +298,40 @@ sponge {
# Sponsors from high to low donation amounts
sponsors = [
{
"name": "MC Server Hosting",
"image": "images/sponsors/mcserverhosting.png",
"link": "https://mcserverhosting.net/?ref=sponge"
"name": "BisectHosting",
"image": "images/sponsors/bisecthosting.svg",
"link": "https://bisecthosting.com/sponge",
"weight": 37
},
{
"name": "Minecraft Index",
"image": "images/sponsors/minecraftindex.svg",
"link": "https://minecraftindex.net/",
"weight": 17
},
{
"name": "Shockbyte",
"image":"images/sponsors/shockbyte.png",
"link": "https://shockbyte.com/",
"weight": 10
},
{
"name": "CreeperHost",
"image": "images/sponsors/creeperhost.svg",
"link": "https://billing.creeperhost.net/link.php?id=8"
"link": "https://billing.creeperhost.net/link.php?id=8",
"weight": 1
},
{
"name": "JetBrains",
"image": "images/sponsors/jetbrains.svg",
"link": "https://www.jetbrains.com/"
"link": "https://www.jetbrains.com/",
"weight": 1
},
{
"name": "YourKit",
"image": "images/sponsors/yourkit.png",
"link": "https://www.yourkit.com/"
},
{
"name": "Minecraft Index",
"image": "images/sponsors/minecraftindex.svg",
"link": "https://minecraftindex.net/"
},
"link": "https://www.yourkit.com/",
"weight": 1
}
]
}
1 change: 1 addition & 0 deletions ore/public/images/sponsors/bisecthosting.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ore/public/images/sponsors/mcserverhosting.png
Binary file not shown.
Binary file added ore/public/images/sponsors/shockbyte.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 00499f5

Please sign in to comment.