Skip to content

Commit 4327920

Browse files
EarthcomputerEarthcomputer
committed
Merge branch '2023.1' into 2023.2
# Conflicts: # gradle.properties
2 parents 117fc78 + 6d668ac commit 4327920

File tree

893 files changed

+2000
-2341
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

+2000
-2341
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/pr-target-branch-action@v2.1
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

‎externalAnnotations/net/minecraft/client/option/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/resource/language/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/resources/annotations.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!--
2+
Minecraft Development for IntelliJ
3+
4+
https://mcdev.io/
5+
6+
Copyright (C) 2024 minecraft-dev
7+
8+
This program is free software: you can redistribute it and/or modify
9+
it under the terms of the GNU Lesser General Public License as published
10+
by the Free Software Foundation, version 3.0 only.
11+
12+
This program is distributed in the hope that it will be useful,
13+
but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
GNU General Public License for more details.
16+
17+
You should have received a copy of the GNU Lesser General Public License
18+
along with this program. If not, see <https://www.gnu.org/licenses/>.
19+
-->
20+
21+
<root>
22+
<item name="net.minecraft.client.resources.I18n java.lang.String format(java.lang.String, java.lang.Object...) 0">
23+
<annotation name="com.demonwav.mcdev.annotations.Translatable">
24+
<val name="foldMethod" val="true"/>
25+
<val name="allowArbitraryArgs" val="true"/>
26+
</annotation>
27+
</item>
28+
<item name="net.minecraft.client.resources.I18n boolean hasKey(java.lang.String) 0">
29+
<annotation name="com.demonwav.mcdev.annotations.Translatable"/>
30+
</item>
31+
</root>

‎externalAnnotations/net/minecraft/client/resources/language/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/command/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/network/chat/annotations.xml

Lines changed: 7 additions & 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
@@ -39,6 +39,12 @@
3939
<val name="foldMethod" val="true"/>
4040
</annotation>
4141
</item>
42+
<item name="net.minecraft.network.chat.Component net.minecraft.network.chat.MutableComponent translatableEscape(java.lang.String, java.lang.Object...) 0">
43+
<annotation name="com.demonwav.mcdev.annotations.Translatable">
44+
<val name="foldMethod" val="true"/>
45+
<val name="allowArbitraryArgs" val="true"/>
46+
</annotation>
47+
</item>
4248
<item name="net.minecraft.network.chat.Component net.minecraft.network.chat.MutableComponent translatableWithFallback(java.lang.String, java.lang.String) 0">
4349
<annotation name="com.demonwav.mcdev.annotations.Translatable"/>
4450
</item>

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

Lines changed: 7 additions & 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
@@ -41,6 +41,12 @@
4141
<val name="foldMethod" val="true"/>
4242
</annotation>
4343
</item>
44+
<item name="net.minecraft.text.Text net.minecraft.text.MutableText stringifiedTranslatable(java.lang.String, java.lang.Object...) 0">
45+
<annotation name="com.demonwav.mcdev.annotations.Translatable">
46+
<val name="foldMethod" val="true"/>
47+
<val name="allowArbitraryArgs" val="true"/>
48+
</annotation>
49+
</item>
4450
<item name="net.minecraft.text.Text net.minecraft.text.MutableText translatableWithFallback(java.lang.String, java.lang.String) 0">
4551
<annotation name="com.demonwav.mcdev.annotations.Translatable"/>
4652
</item>

‎externalAnnotations/net/minecraft/util/text/annotations.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!--
2+
Minecraft Development for IntelliJ
3+
4+
https://mcdev.io/
5+
6+
Copyright (C) 2024 minecraft-dev
7+
8+
This program is free software: you can redistribute it and/or modify
9+
it under the terms of the GNU Lesser General Public License as published
10+
by the Free Software Foundation, version 3.0 only.
11+
12+
This program is distributed in the hope that it will be useful,
13+
but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
GNU General Public License for more details.
16+
17+
You should have received a copy of the GNU Lesser General Public License
18+
along with this program. If not, see <https://www.gnu.org/licenses/>.
19+
-->
20+
21+
<!-- Yarn mappings -->
22+
23+
<root>
24+
<item name="net.minecraft.util.text.TranslationTextComponent TranslationTextComponent(java.lang.String) 0">
25+
<annotation name="com.demonwav.mcdev.annotations.Translatable"/>
26+
</item>
27+
<item name="net.minecraft.util.text.TranslationTextComponent TranslationTextComponent(java.lang.String, java.lang.Object...) 0">
28+
<annotation name="com.demonwav.mcdev.annotations.Translatable">
29+
<val name="foldMethod" val="true"/>
30+
<val name="allowArbitraryArgs" val="true"/>
31+
</annotation>
32+
</item>
33+
</root>

‎externalAnnotations/net/minecraftforge/server/command/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

‎gradle.properties

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

‎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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2BuilderImpl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2Impl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3BuilderImpl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3Impl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelBuilderImpl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelImpl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelBuilderImpl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelImpl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModelBuilderImpl.groovy

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

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModelImpl.groovy

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

‎src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModel.java

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

‎src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2.java

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

‎src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3.java

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)