Merge branch 'master' into 1.15

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/settings/CarpetSettings.java

src/main/java/carpet/settings/CarpetSettings.java

@@ -27,7 +27,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.0.4-v190823_115";
+    public static final String carpetVersion = "1.0.5-v190828";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;

src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "carpet",
-  "version": "1.0.4",
+  "version": "1.0.5",
 
   "name": "Carpet Mod in Fabric",
   "description": "Carpet made out of fabric",