Merge branch 'master' into future

docs/scarpet/Full.md

@@ -630,11 +630,12 @@ There is bunch of them - they require a number and spit out a number, doing what
 
 ### `fact(n)`
 
-Factorial of a number, a.k.a `n!`, just not in `scarpet`. Gets big... quick...
+Factorial of a number, a.k.a `n!`, just not in `scarpet`. Gets big... quick... Therefore, values larger 
+than `fact(20)` will not return the exact value, but a value with 'double-float' precision.
 
 ### `sqrt(n)`
 
-Square root. For other fancy roots, use `^`, math and yo noggin. Imagine square roots on a tree...
+Square root (not 'a squirt') of a number. For other fancy roots, use `^`, math and yo noggin. Imagine square roots on a tree...
 
 ### `abs(n)`
 
@@ -2650,7 +2651,7 @@ With an optional feature, it returns value for the specified attribute for that
 * `'category'`: the parent biome this biome is derived from. Possible values include:
 `'none'`, `'taiga'`, `'extreme_hills'`, `'jungle'`, `'mesa'`, `'plains'`, `'savanna'`,
 `'icy'`, `'the_end'`, `'beach'`, `'forest'`, `'ocean'`, `'desert'`, `'river'`,
-`'swamp'`, `'mushroom'` and  `'nether'`.
+`'swamp'`, `'mushroom'` , `'nether'`, `'underground'` (1.18+) and `'mountain'` (1.18+).
 * `'temperature'`: temperature from 0 to 1
 * `'fog_color'`: RGBA color value of fog 
 * `'foliage_color'`: RGBA color value of foliage
@@ -2659,11 +2660,11 @@ With an optional feature, it returns value for the specified attribute for that
 * `'water_fog_color'`: RGBA color value of water fog
 * `'humidity'`: value from 0 to 1 indicating how wet is the biome
 * `'precipitation'`: `'rain'` `'snot'`, or `'none'`... ok, maybe `'snow'`, but that means snots for sure as well.
-* `'depth'`: (1.17.1 and below) float value indicating how high or low the terrain should generate. Values > 0 indicate generation above sea level
+* `'depth'`: (1.17.1 and below only) float value indicating how high or low the terrain should generate. Values > 0 indicate generation above sea level
 and values < 0, below sea level.
-* `'scale'`: (1.17 and below) float value indicating how flat is the terrain.
+* `'scale'`: (1.17.1 and below only) float value indicating how flat is the terrain.
 * `'features'`: list of features that generate in the biome, grouped by generation steps
-* `'structures'`: list of structures that generate in the biome.
+* `'structures'`: (1.17.1 and below only) list of structures that generate in the biome.
 
 ### `solid(pos)`
 

gradle.properties

@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
 	fabric_version=0.40.4+1.18
 
 # Mod Properties
-	mod_version = 1.4.46
+	mod_version = 1.4.47
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

src/main/java/carpet/CarpetSettings.java

@@ -43,7 +43,7 @@ import static carpet.settings.RuleCategory.CLIENT;
 @SuppressWarnings("CanBeFinal")
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.4.46+v210918";
+    public static final String carpetVersion = "1.4.47+v210924";
     public static final Logger LOG = LogManager.getLogger("carpet");
     public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
     public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);