User: joe
Date: 16 Jan 24 23:38
Revision: b579f118c916306d05ce1f58925c94f87806053d
Summary:
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


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9000&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ build.gradle.kts	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: gradle.properties
===================================================================
--- gradle.properties	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ gradle.properties	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
 #
 # https://mcdev.io/
 #
-# Copyright (C) 2023 minecraft-dev
+# Copyright (C) 2024 minecraft-dev
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/creator/buildsystem/maven-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt
===================================================================
--- src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/facet/MinecraftFacet.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacet.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/facet/MinecraftFacet.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/facet/MinecraftFacetDetector.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacetDetector.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/facet/MinecraftFacetDetector.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/facet/ProjectReimporter.kt
===================================================================
--- src/main/kotlin/facet/ProjectReimporter.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/facet/ProjectReimporter.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/insight/generation/ui/EventListenerWizard.kt
===================================================================
--- src/main/kotlin/insight/generation/ui/EventListenerWizard.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/insight/generation/ui/EventListenerWizard.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/platform/AbstractModuleType.kt
===================================================================
--- src/main/kotlin/platform/AbstractModuleType.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/platform/AbstractModuleType.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/platform/bukkit/creator/ui-steps.kt
===================================================================
--- src/main/kotlin/platform/bukkit/creator/ui-steps.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/platform/bukkit/creator/ui-steps.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/platform/mcp/actions/SrgActionBase.kt
===================================================================
--- src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt
===================================================================
--- src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/update/PluginUtil.kt
===================================================================
--- src/main/kotlin/update/PluginUtil.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/main/kotlin/update/PluginUtil.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/test/kotlin/nbt/NbtParseTest.kt
===================================================================
--- src/test/kotlin/nbt/NbtParseTest.kt	(revision ae651ead2573a5186635d3b402135870ab5d514c)
+++ src/test/kotlin/nbt/NbtParseTest.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published