Merge branch 'master' into 1.17
# Conflicts: # gradle.properties
This commit is contained in:
commit
0453dc33a0
4 files changed
+25
-9
No files matched your search
@@ -36,7 +36,7 @@ import static carpet.settings.RuleCategory.CLIENT;
|
||||
@SuppressWarnings("CanBeFinal")
|
||||
public class CarpetSettings
|
||||
{
|
||||
public static final String carpetVersion = "1.4.21+v201216";
|
||||
public static final String carpetVersion = "1.4.22+v210113";
|
||||
public static final Logger LOG = LogManager.getLogger("carpet");
|
||||
public static boolean skipGenerationChecks = false;
|
||||
public static boolean impendingFillSkipUpdates = false;
|
||||
|
||||
Reference in new issue
Block a user