Merge branch 'master' into 1.17

docs/scarpet/language/Overview.md

@@ -69,7 +69,7 @@ Writing a program, is like writing a `2+3`, just a bit longer.
 ## Basic language components
 
 Programs consist of constants, like `2`, `3.14`, `pi`, or `'foo'`, operators like `+`, `/`, `->`, variables which you 
-can define, like `foo` or special ones that will be defined for you, like `_x`, or `_` , which I specific to a each
+can define, like `foo` or special ones that will be defined for you, like `_x`, or `_` , which are specific to each
 built in function, and functions with name, and arguments in the form of `f(a,b,c)`, where `f` is the function name,
 and `a, b, c` are the arguments which can be any other expression. And that's all the parts of the language, so all
 in all - sounds quite simple.

gradle.properties

@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
 	fabric_version=0.34.3+1.17
 
 # Mod Properties
-	mod_version = 1.4.35
+	mod_version = 1.4.36
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

src/main/java/carpet/CarpetSettings.java

@@ -42,7 +42,7 @@ import static carpet.settings.RuleCategory.CLIENT;
 @SuppressWarnings("CanBeFinal")
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.4.35+v210505";
+    public static final String carpetVersion = "1.4.36+v210512";
     public static final Logger LOG = LogManager.getLogger("carpet");
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;