diff options
author | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-05-20 15:41:29 +0300 |
---|---|---|
committer | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-05-20 15:41:29 +0300 |
commit | ae87b1554ab83d4e294afc614aca910d59fe9de7 (patch) | |
tree | a4c81fa6c9065c072e46ece1792222efae9c6b89 /gradle.properties | |
parent | e8b0829afbd32830dc1dc9b45f6fbd82d0fde2fa (diff) | |
parent | 0c90421761cd68f1aef6c1972644cb560509e095 (diff) | |
download | LibGui-ae87b1554ab83d4e294afc614aca910d59fe9de7.tar.gz LibGui-ae87b1554ab83d4e294afc614aca910d59fe9de7.tar.bz2 LibGui-ae87b1554ab83d4e294afc614aca910d59fe9de7.zip |
Merge branch 'unstable/2.0' into scroll-panel
# Conflicts:
# src/main/java/io/github/cottonmc/cotton/gui/CottonInventoryController.java
# src/main/java/io/github/cottonmc/cotton/gui/GuiDescription.java
# src/main/java/io/github/cottonmc/cotton/gui/style/StyleEntry.java
# src/main/java/io/github/cottonmc/cotton/gui/widget/WItemSlot.java
# src/main/java/io/github/cottonmc/cotton/gui/widget/WPanel.java
# src/main/java/io/github/cottonmc/cotton/gui/widget/WPlayerInvPanel.java
# src/main/java/io/github/cottonmc/cotton/gui/widget/WWidget.java
Diffstat (limited to 'gradle.properties')
-rw-r--r-- | gradle.properties | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gradle.properties b/gradle.properties index b1db372..e4903dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=20w17a - yarn_mappings=20w17a+build.4 - loader_version=0.8.2+build.194 + minecraft_version=20w20b + yarn_mappings=20w20b+build.7 + loader_version=0.8.3+build.196 # Mod Properties - mod_version = 1.9.0 + mod_version = 2.0.0 maven_group = io.github.cottonmc archives_base_name = LibGui # Dependencies - fabric_version=0.6.2+build.327-1.16 - jankson_version=2.0.1+j1.2.0 + fabric_version=0.10.9+build.346-1.16 + jankson_version=2.1.0+j1.2.0 |