Skip to content

Commit

Permalink
Merge branch '2020.1' into 2020.2
Browse files Browse the repository at this point in the history
  • Loading branch information
DenWav committed Apr 9, 2021
2 parents 5cb25c1 + 601f687 commit caee272
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
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 = 2020.2
ideaVersionName = 2020.2

coreVersion = 1.5.7
coreVersion = 1.5.8
downloadIdeaSources = true

pluginTomlVersion = 0.2.140.3644-202
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.7-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.8-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
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<id>com.demonwav.minecraft-dev</id>
<name>Minecraft Development</name>
<vendor email="[email protected]" url="https://minecraftdev.org/">DemonWav</vendor>
<vendor email="[email protected]" url="https://minecraftdev.org/">minecraft-dev</vendor>

<description><![CDATA[
Brings support for Bukkit, Spigot, Paper, Sponge, Forge, Fabric, MCP, Mixin, Velocity, BungeeCord, Waterfall, and
Expand Down

0 comments on commit caee272

Please sign in to comment.