Change details: joe on 16 Jan 24 23:38

Comment:	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	Status:	all builds with this change have finished
Revision:	b579f118c916306d05ce1f58925c94f87806053d	VCS Root:	minecraft-dev/MinecraftDev (Git)
Parent revisions:	ae651ead2573a5186635d3b402135870ab5d514c, 4327920a8308a73df8295b95029b705167a76a3b
User:	Unknown (none of TeamCity users defined joe* username in their VCS username settings)*

Changed: 15 files (15 edited) in

edited	build.gradle.kts
edited	gradle.properties
edited	src/main/kotlin/creator/buildsystem/maven-steps.kt
edited	src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt
edited	src/main/kotlin/facet/MinecraftFacet.kt
edited	src/main/kotlin/facet/MinecraftFacetDetector.kt
edited	src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt
edited	src/main/kotlin/facet/ProjectReimporter.kt
edited	src/main/kotlin/insight/generation/ui/EventListenerWizard.kt
edited	src/main/kotlin/platform/AbstractModuleType.kt
edited	src/main/kotlin/platform/bukkit/creator/ui-steps.kt
edited	src/main/kotlin/platform/mcp/actions/SrgActionBase.kt
edited	src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt
edited	src/main/kotlin/update/PluginUtil.kt
edited	src/test/kotlin/nbt/NbtParseTest.kt