Merge branch 'master' into 1.16
# Conflicts: # gradle.properties # src/main/java/carpet/CarpetSettings.java # src/main/resources/fabric.mod.json
This commit is contained in:
commit
4270f8d718
3 files changed
+3
-3
No files matched your search
@@ -33,7 +33,7 @@ import static carpet.settings.RuleCategory.CLIENT;
|
||||
@SuppressWarnings("CanBeFinal")
|
||||
public class CarpetSettings
|
||||
{
|
||||
public static final String carpetVersion = "1.3.19b+v200415";
|
||||
public static final String carpetVersion = "1.3.20+v200422";
|
||||
public static final Logger LOG = LogManager.getLogger();
|
||||
public static boolean skipGenerationChecks = false;
|
||||
public static boolean impendingFillSkipUpdates = false;
|
||||
|
||||
Reference in new issue
Block a user