Skip to content

Commit b579f11

Browse files
EarthcomputerEarthcomputer
committed
Merge branch '2023.2' into 2023.3
# Conflicts: # externalAnnotations/net/minecraft/client/resources/annotations.xml # externalAnnotations/net/minecraft/util/text/annotations.xml # src/main/kotlin/facet/MinecraftFacetEditorTab.kt
2 parents ae651ea + 4327920 commit b579f11

File tree

893 files changed

+1945
-2344
lines changed

Some content is hidden

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

893 files changed

+1945
-2344
lines changed

‎.github/workflows/pr_check_target_branch.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Make sure PRs target the dev branch
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, edited]
6+
7+
jobs:
8+
check-branch:
9+
runs-on: ubuntu-latest
10+
steps:
11+
# Do not check out the repository here. See https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
12+
- uses: Vankka/[email protected]
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
with:
16+
target: /\b(?!dev\b).*?\b/
17+
exclude: dev
18+
change-to: dev
19+
already-exists-action: nothing
20+
comment: |
21+
New PRs should target the `dev` branch. The base branch of this PR has been automatically changed to `dev`.
22+
Please check that there are no merge conflicts.
23+

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://mcdev.io/
55
*
6-
* Copyright (C) 2023 minecraft-dev
6+
* Copyright (C) 2024 minecraft-dev
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU Lesser General Public License as published

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://mcdev.io/
55
*
6-
* Copyright (C) 2023 minecraft-dev
6+
* Copyright (C) 2024 minecraft-dev
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU Lesser General Public License as published

‎buildSrc/settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://mcdev.io/
55
*
6-
* Copyright (C) 2023 minecraft-dev
6+
* Copyright (C) 2024 minecraft-dev
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU Lesser General Public License as published

‎buildSrc/src/main/kotlin/Filter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://mcdev.io/
55
*
6-
* Copyright (C) 2023 minecraft-dev
6+
* Copyright (C) 2024 minecraft-dev
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU Lesser General Public License as published

‎buildSrc/src/main/kotlin/mcdev.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://mcdev.io/
55
*
6-
* Copyright (C) 2023 minecraft-dev
6+
* Copyright (C) 2024 minecraft-dev
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU Lesser General Public License as published

‎buildSrc/src/main/kotlin/util.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://mcdev.io/
55
*
6-
* Copyright (C) 2023 minecraft-dev
6+
* Copyright (C) 2024 minecraft-dev
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU Lesser General Public License as published

‎copyright.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Minecraft Development for IntelliJ
22

33
https://mcdev.io/
44

5-
Copyright (C) 2023 minecraft-dev
5+
Copyright (C) 2024 minecraft-dev
66

77
This program is free software: you can redistribute it and/or modify
88
it under the terms of the GNU Lesser General Public License as published

‎externalAnnotations/com/mojang/blaze3d/platform/annotations.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
https://mcdev.io/
55
6-
Copyright (C) 2023 minecraft-dev
6+
Copyright (C) 2024 minecraft-dev
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU Lesser General Public License as published

‎externalAnnotations/net/minecraft/client/annotations.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
https://mcdev.io/
55
6-
Copyright (C) 2023 minecraft-dev
6+
Copyright (C) 2024 minecraft-dev
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU Lesser General Public License as published

0 commit comments

Comments
 (0)