Merge branch 'master' into 1.15
# Conflicts: # gradle.properties
This commit is contained in:
commit
29fa86ca8a
3 files changed
+3
-3
No files matched your search
@@ -28,7 +28,7 @@ import static carpet.settings.RuleCategory.TNT;
|
||||
|
||||
public class CarpetSettings
|
||||
{
|
||||
public static final String carpetVersion = "1.2.2+v191108";
|
||||
public static final String carpetVersion = "1.2.3+v191113";
|
||||
public static final Logger LOG = LogManager.getLogger();
|
||||
public static boolean skipGenerationChecks = false;
|
||||
public static boolean impendingFillSkipUpdates = false;
|
||||
|
||||
Reference in new issue
Block a user