From 05200ac9444dfb0ef832b1fe96a73cd6e37bde7a Mon Sep 17 00:00:00 2001 From: Julian Wandhoven <38176040+JulianWww@users.noreply.github.com> Date: Wed, 12 May 2021 14:17:05 +0200 Subject: [PATCH 1/2] Update Overview.md (#855) --- docs/scarpet/language/Overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scarpet/language/Overview.md b/docs/scarpet/language/Overview.md index e3728605..80da2ba4 100644 --- a/docs/scarpet/language/Overview.md +++ b/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. From a593f1cf14b048e4b5ec84a92c6f924ae3c41ba7 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 12 May 2021 17:05:28 -0300 Subject: [PATCH 2/2] 1.4.36 --- gradle.properties | 2 +- src/main/java/carpet/CarpetSettings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f5d5042a..753231ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G fabric_version=0.29.4+1.16 # Mod Properties - mod_version = 1.4.35 + mod_version = 1.4.36 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 87537117..9d6c62ec 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/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;