Skip to content

Commit 112f434

Browse files
authored
Merge branch 'main' into bettercodeui
2 parents 920b9e0 + 5d24212 commit 112f434

File tree

120 files changed

+67209
-55160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+67209
-55160
lines changed

.github/workflows/pull_request.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Stylua
2+
3+
on:
4+
push:
5+
branches:
6+
- '*'
7+
8+
jobs:
9+
stylua:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out code
13+
uses: actions/checkout@v4
14+
with:
15+
token: ${{ secrets.GITHUB_TOKEN }}
16+
17+
- name: Run stylua
18+
uses: JohnnyMorganz/stylua-action@v4
19+
with:
20+
token: ${{ secrets.GITHUB_TOKEN }}
21+
version: latest
22+
args: .
23+
24+
- name: Commit changes
25+
run: |
26+
git config --global user.name "jolly[bot]"
27+
git config --global user.email "jolly[bot]@users.noreply.github.com"
28+
git add .
29+
git diff --cached --quiet || git commit -m "jolly-bot: auto-format Lua files using Stylua"
30+
git push

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# LSP setting files (add more if applicable)
2+
.vscode/*
3+
.luarc.json

Cryptid.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"id": "Cryptid",
3+
"name": "Cryptid",
4+
"display_name": "Cryptid",
5+
"author": ["MathIsFun_, Cryptid and Balatro Discords"],
6+
"description": "Adds unbalanced ideas to Balatro.",
7+
"prefix": "cry",
8+
"main_file": "Cryptid.lua",
9+
"priority": 114,
10+
"badge_colour": "708b91",
11+
"badge_text_colour": "FFFFFF",
12+
"version": "0.5.5",
13+
"dependencies": [
14+
"Talisman (>=2.0.9)",
15+
"Steamodded (>=1.0.0~BETA-0308a)"
16+
],
17+
"conflicts": [
18+
"Saturn"
19+
]
20+
}

0 commit comments

Comments
 (0)