Skip to content

Commit b5a6d54

Browse files
committed
Merge branch '1.19/dev' into 1.20/dev
# Conflicts: # build.gradle.kts # gradle.properties
2 parents 28b1242 + bd883f9 commit b5a6d54

18 files changed

+323
-600
lines changed

.github/workflows/build-pr.yml

-34
This file was deleted.

.github/workflows/build.yml

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
paths-ignore:
66
- .docs/**
7+
pull_request:
8+
paths-ignore:
9+
- .docs/**
710

811

912
jobs:

.github/workflows/codeql.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name: "CodeQL"
22

33
on:
4+
workflow_dispatch:
45
push:
56
paths-ignore:
67
- .docs/**
78
pull_request:
8-
workflow_dispatch:
9-
schedule:
10-
- cron: '0 0 * * *'
9+
paths-ignore:
10+
- .docs/**
11+
1112

1213
jobs:
1314
analyze:

.gitignore

+10-18
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,30 @@ bin
1010
.project
1111

1212
# idea
13-
out
13+
out/
1414
*.ipr
1515
*.iws
1616
*.iml
1717
.idea
1818

1919
# gradle
20-
build
21-
.gradle
20+
build/
21+
.gradle/
2222

2323
# other
24-
eclipse
25-
run
24+
eclipse/
25+
run/
2626

2727
# Files from Forge MDK
2828
forge*changelog.txt
2929
/server/
3030

3131
# Custom
32-
/src/main/resources/assets/create/
33-
jars
34-
/libs/
35-
/changelog.html
36-
/fabric/changelog.html
37-
/forge/changelog.html
38-
/common/changelog.html
39-
/recent_changelog.html
40-
/fabric/recent_changelog.html
41-
/forge/recent_changelog.html
42-
/common/recent_changelog.html
43-
/forge/libs/
32+
**/src/main/resources/assets/create/
33+
jars/
34+
**/libs/
35+
**/changelog.html
36+
**/recent_changelog.html
4437
.DS_Store
4538

4639
##################
@@ -49,7 +42,6 @@ jars
4942

5043
# Slimeist (techno-sam)
5144
/build_archive/
52-
/common/src/main/resources/assets/create/
5345
/development_assets/venv/
5446
/common/src/main/resources/assets/minecraft/textures/block/
5547
/.architectury-transformer/

0 commit comments

Comments
 (0)