Skip to content

Commit

Permalink
Merge branch '2024.1' into 2024.2
Browse files Browse the repository at this point in the history
  • Loading branch information
RedNesto committed Aug 10, 2024
2 parents e4376bf + 65098a4 commit cd57fa6
Show file tree
Hide file tree
Showing 22 changed files with 954 additions and 329 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ hs_err_pid*
**/.gradle/
.intellijPlatform/
.sandbox/
.intellijPlatform/
.kotlin/

/gen/

Expand Down
13 changes: 11 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Minecraft Development for IntelliJ

## [Unreleased]
## [1.8.1] - 2024-08-10

### Added

Expand All @@ -11,6 +11,13 @@
- Inspection highlighting discouraged instruction shifts
- Inspections for when @Inject local capture is unused and for when they can be replaced with @Local
- [#2306](https://github.com/minecraft-dev/MinecraftDev/issues/2306) Use mixin icon for mixin classes
- Documentation while completing keys in mods.toml
- mods.toml support for neoforge.mods.toml
- Automatically insert an `=` after completing a mods.toml key

### Changed

- [#2353](https://github.com/minecraft-dev/MinecraftDev/issues/2353) Move "Method must not be static" error message to static keyword ([#2354](https://github.com/minecraft-dev/MinecraftDev/pull/2354))

### Fixed

Expand All @@ -20,8 +27,10 @@
- [#2163](https://github.com/minecraft-dev/MinecraftDev/issues/2163) `@ModifyVariable` method signature checking with `STORE`
- [#2282](https://github.com/minecraft-dev/MinecraftDev/issues/2282) Mixin support confusion with `$` and `.` separators in class names
- Recent NeoModDev version import errors
- Recommended Artifact ID value was not sanitized properly
- NeoForge versions in the Architectury were not being matched correctly for the first version of a major Minecraft release

## [1.8.0]
## [1.8.0] - 2024-07-14

This release contains two major features:
- Support for MixinExtras expressions ([#2274](https://github.com/minecraft-dev/MinecraftDev/pull/2274))
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ kotlin.code.style=official
ideaVersion = 2024.2
ideaVersionName = 2024.2

coreVersion = 1.8.0
coreVersion = 1.8.1
org.jetbrains.intellij.platform.downloadSources=true

# Silences a build-time warning because we are bundling our own kotlin library
Expand Down
3 changes: 3 additions & 0 deletions src/main/kotlin/creator/custom/CreatorContext.kt
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,7 @@ data class CreatorContext(
* A general purpose scope dependent of the main creator scope, cancelled when the creator is closed.
*/
fun childScope(name: String): CoroutineScope = scope.childScope(name)

@Suppress("UNCHECKED_CAST")
fun <T> property(name: String): CreatorProperty<T> = properties[name] as CreatorProperty<T>
}
Loading

0 comments on commit cd57fa6

Please sign in to comment.