Skip to content

Commit

Permalink
Merge branch '2020.3' into 2021.1
Browse files Browse the repository at this point in the history
  • Loading branch information
DenWav committed Oct 2, 2021
2 parents 3e781e1 + aa43fec commit 8970d48
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ repositories {
mavenCentral()
maven("https://repo.denwav.dev/repository/maven-public/")
maven("https://repo.spongepowered.org/maven")
maven("https://www.jetbrains.com/intellij-repository/releases")
if (!ideaVersion.endsWith("SNAPSHOT")) {
maven("https://www.jetbrains.com/intellij-repository/releases")
} else {
maven("https://www.jetbrains.com/intellij-repository/snapshots")
}
maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
maven("https://repo.gradle.org/gradle/libs-releases-local/")
maven("https://maven.extracraftx.com")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ kotlin.code.style=official
ideaVersion = 2021.1
ideaVersionName = 2021.1

coreVersion = 1.5.14
coreVersion = 1.5.15
downloadIdeaSources = true

pluginTomlVersion = 0.2.144.3766-211
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Minecraft Development for IntelliJ
</tr>
</table>

Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.14-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.15-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
----------------------

<a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>
Expand Down

0 comments on commit 8970d48

Please sign in to comment.