Merge branch 'master' into 1.15

# Conflicts:
#	gradle.properties

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.2.5-SNAPSHOT'
+	id 'fabric-loom' version '0.2.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -16,7 +16,7 @@ minecraft {
 dependencies {
 	//to change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.

gradle.properties

@@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=19w46b
-	yarn_mappings=19w46b+build.1
-	loader_version=0.6.4+build.169
+	yarn_mappings=19w46b+build.8
+	loader_version=0.7.0+build.171
 
 # Mod Properties
 	mod_version = 1.2.3+v191114

src/main/java/carpet/mixins/CoralBlockMixin.java

@@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import java.util.Random;
 
 @Mixin(CoralBlock.class)
-@Interface(iface = Fertilizable.class, prefix = "fert$")
+//@Interface(iface = Fertilizable.class, prefix = "fert$")
 public abstract class CoralBlockMixin implements Fertilizable
 {
     public boolean isFertilizable(BlockView var1, BlockPos var2, BlockState var3, boolean var4)

src/main/resources/fabric.mod.json

@@ -26,6 +26,7 @@
   ],
 
   "depends": {
+    "minecraft": "1.14.*",
     "fabricloader": ">=0.4.0"
   },
   "suggests": {