Skip to content

Commit

Permalink
Merge branch 'main' into site-upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
Southpaw1496 committed Sep 12, 2023
2 parents dc962e8 + c191182 commit dcb09fd
Show file tree
Hide file tree
Showing 79 changed files with 144 additions and 531 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/commit-preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ jobs:
name: Generate commit preview
steps:
- name: Checkout
uses: akarys42/checkout-with-filter@main
with:
filter: 'blob:none'
fetch-depth: 0
uses: actions/checkout@v3

- name: Enable Corepack shims
run: corepack enable
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/manual-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ jobs:
name: Publish website
steps:
- name: Checkout
uses: akarys42/checkout-with-filter@main
with:
filter: 'blob:none'
fetch-depth: 0
uses: actions/checkout@v3

- name: Enable Corepack shims
run: corepack enable
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/pr-preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ jobs:
name: Generate PR preview
steps:
- name: Checkout
uses: akarys42/checkout-with-filter@main
with:
filter: 'blob:none'
fetch-depth: 0
uses: checkout/actions@v3

- name: Enable Corepack shims
run: corepack enable
Expand Down
4 changes: 4 additions & 0 deletions public/assets/img/launchers/modrinth.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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
107 changes: 107 additions & 0 deletions public/incompatible-mods.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
[{
"ids": ["armored-elytra"],
"name": "Armored Elytra",
"type": "WORKAROUND",
"note": "Add `-Dloader.debug.loadLate=armored-elytra` to your java args"
},

{
"ids": ["better_loading_screen"],
"name": "Better Loading Screen",
"type": "GAME"
},

{
"ids": ["bigbeacons"],
"name": "Big Beacons",
"type": "GAME"
},

{
"ids": ["cenchants"],
"name": "Combat Enchatments",
"type": "GAME"
},

{
"ids": ["decorative_blocks"],
"name": "Decorative Blocks",
"type": "GAME"
},

{
"ids": ["logbegone"],
"name": "Log Begone",
"type": "SELF",
"note": "Not all log messages are passed through the mod's filter."
},

{
"ids": ["mbp"],
"name": "More Block Predicates",
"type": "GAME"
},

{
"ids": ["semitranslucency"],
"name": "Semitranslucency Fix",
"type": "GAME"
},

{
"ids": ["viafabricplus"],
"name": "ViaFabricPlus",
"type": "GAME",
"note": "Only occurs on linux"
},

{
"ids": ["vulkanmod"],
"name": "VulkanMod",
"type": "GAME"
},

{
"ids": ["essential-container"],
"name": "Essential",
"type": "SELF",
"note": "Will not be present in Mod Menu"
},

{
"ids": ["seamless_loading_screen"],
"name": "Seamless Loading Screen",
"type": "SELF"
},

{
"ids": ["codex"],
"name": "Codex",
"type": "GAME"
},

{
"ids": ["libjf"],
"name": "LibJF",
"type": "GAME"
},

{
"ids": ["optifabric", "optifine"],
"name": "OptiFabric/OptiFine",
"type": "GAME"
},

{
"ids": ["rpgdifficulty"],
"name": "Rpg Difficulty",
"type": "GAME"
},

{
"ids": ["fldf"],
"name": "Fast Leaf Decay (Hydos)",
"type": "GAME",
"note": "Tries to crash the game as part of a targetted harassment campaign against Quilt and its users"
}
]
6 changes: 6 additions & 0 deletions src/components/parts/install/Launchers.astro
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ import InstallerButton from "@atoms/InstallerButton.astro";
titleKey="install:platform-bakaxl"
altKey="install:logo-bakaxl"
/>
<InstallerButton
href="/install/modrinth"
logo="modrinth.svg"
titleKey="install:platform-modrinth"
altKey="install:logo-modrinth"
/>
<InstallerButton
href="/install/multimc"
logo="multimc.svg"
Expand Down
3 changes: 3 additions & 0 deletions src/locales/en/install.flt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
-technic = Technic
-curseforge = CurseForge
-gdlauncher = GDLauncher
-modrinth = Modrinth App

platform-bakaxl = BakaXL
platform-client = Client
Expand All @@ -14,6 +15,7 @@ platform-atlauncher = {-atlauncher}
platform-multimc = {-multimc}
platform-prismlauncher = {-prismlauncher}
platform-technic = {-technic}
platform-modrinth = {-modrinth}
platform-curseforge = {-curseforge}
platform-gdlauncher = {-gdlauncher}

Expand All @@ -24,6 +26,7 @@ logo-bakaxl = {-bakaxl} logo
logo-multimc = {-multimc} logo
logo-prismlauncher = {-prismlauncher} logo
logo-technic = Technic Launcher logo
logo-modrinth = {-modrinth} logo
logo-curseforge = {-curseforge} logo
logo-gdlauncher = {-gdlauncher} logo

Expand Down
Loading

1 comment on commit dcb09fd

@Cozy-GitHub
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See preview on Cloudflare Pages: https://c04f99d5.quiltmc-org.pages.dev

Please sign in to comment.