Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	README.md
#	docs/mods.md
#	src/universal/config/global_data_and_resourcepacks.toml

README.md

@@ -20,3 +20,4 @@ While creating a new instance, you can select the pack after searching for it in
 These must be manually updated:
 - [`Better Leaves` (resource-pack)](https://modrinth.com/resourcepack/better-leaves) v7.2
 - [`Create Renewable Ores` (data-pack)](https://modrinth.com/datapack/create-renewable-ores) v1
+- [`Incendium Optional Resourcepack` (resource-pack)](https://modrinth.com/resourcepack/incendium-optional-resourcepack) v5.3.7

docs/mods.md

@@ -1,6 +1,8 @@
 # Mods
 
-The [`Better Leaves` resource-pack by MidnightDust](https://modrinth.com/resourcepack/better-leaves) is preinstalled.
+These two resource-packs are preinstalled:
+- [`Better Leaves` by MidnightDust](https://modrinth.com/resourcepack/better-leaves)
+- [`Incendium Optional Resourcepack` by Stardust](https://modrinth.com/resourcepack/incendium-optional-resourcepack)
 
 ## Included
 ### Performance
@@ -23,9 +25,10 @@ The [`Better Leaves` resource-pack by MidnightDust](https://modrinth.com/resourc
 - `Sodium Extra` — more settings
 
 ### World-gen
-- `BetterEnd`
-- `BetterNether`
 - `ChoiceTheorem's Overhauled Village` — more village types
+- `Incendium` — more biomes and structures in the Nether
+- `Nullscape` — more biomes and structures in the End
+- `Terralith` — more biomes and structures in the Overworld
 - `Wilder Wild`
 
 ### Building blocks
@@ -104,12 +107,12 @@ The [`Better Leaves` resource-pack by MidnightDust](https://modrinth.com/resourc
 - `Global Packs` 
 - `Main Menu Credits`
 - `OneTimeOverrides`
+- `Remove Terralith Intro Message`
 
 ### Library
 - `Architectury` — required by `Animal Feeding Trough`
 - `Athena` — required by `Chipped`
 - `Balm` — required by `Cooking for Blockheads`
-- `BCLib` — required by `BetterNether`, `BetterEnd`
 - `Bookshelf` — required by `Enchantment Description`
 - `Botarium` — required by `Create: New Age`
 - `Cardinal Components API` — required by `Traveler's Backpack`

src/client/one-time-overrides/config/bclib/client.json

@@ -1,29 +0,0 @@
-{
-  "version": {
-    "didShowWelcome [default: false]": true,
-    "check [default: true]": false
-  },
-  "ui": {
-    "showUpdateInfo [default: true]": false,
-    "useModrinthForUpdates [default: false]": false,
-    "forceBetterXPreset [default: true]": true,
-    "suppressExperimentalDialogOnLoad [default: false]": true,
-    "notTheDonorType [default: true]": true
-  },
-  "auto_sync": {
-    "enabled [default: true]": true,
-    "acceptConfigs [default: true]": true,
-    "acceptFiles [default: true]": true,
-    "acceptMods [default: true]": true,
-    "displayModInfo [default: true]": true,
-    "debugHashes [default: false]": false
-  },
-  "rendering": {
-    "customFogRendering [default: true]": true,
-    "netherThickFog [default: true]": true,
-    "FogDensity [default: 1.0]": 1.0
-  },
-  "infos": {
-    "survives_on_hint [default: true]": true
-  }
-}

src/client/one-time-overrides/options.txt

@@ -11,8 +11,7 @@ guiScale:3
 particles:0
 maxFps:120
 graphicsMode:1
-resourcePacks:["vanilla","fabric","continuity:default","continuity:glass_pane_culling_fix","file/Better-Leaves.zip"]
-incompatibleResourcePacks:["file/Better-Leaves.zip"]
+resourcePacks:["vanilla","fabric","continuity:default","continuity:glass_pane_culling_fix"]
 pauseOnLostFocus:false
 tutorialStep:none
 skipMultiplayerWarning:true

src/universal/config/global_data_and_resourcepacks.toml

@@ -1,7 +1,10 @@
 enable_system_global_packs = false
 
 [resourcepacks]
-required = []
+required = [
+    "globalpacks/resourcepacks/"
+]
+
 optional = []
 
 [datapacks]

src/universal/mods/bclib.hm.json

@@ -1,21 +0,0 @@
-{
-  "formatVersion": 1,
-  "displayName": "BCLib",
-  "enabled": true,
-  "version": {
-    "name": "3.0.13",
-    "size": 2330374,
-    "fileName": "bclib-3.0.13.jar",
-    "downloadUrl": "https://cdn.modrinth.com/data/BgNRHReB/versions/bccqbyya/bclib-3.0.13.jar",
-    "hashes": {
-      "sha1": "4850fbc25fa1f2217916155ed354579af1c15205",
-      "sha512": "ece143b42d6a56015131451a1c6fec0137b3c1754e22453f8f55ca1f17070ddd009279b48eab531e598c7fd47376405b27e3306156634a019de87320ce53f876"
-    }
-  },
-  "source": {
-    "type": "modrinth",
-    "modId": "BgNRHReB",
-    "versionId": "bccqbyya",
-    "ignoreUpdates": false
-  }
-}

src/universal/mods/betterend.hm.json

@@ -1,21 +0,0 @@
-{
-  "formatVersion": 1,
-  "displayName": "BetterEnd",
-  "enabled": true,
-  "version": {
-    "name": "4.0.10",
-    "size": 92721740,
-    "fileName": "better-end-4.0.10.jar",
-    "downloadUrl": "https://cdn.modrinth.com/data/gc8OEnCC/versions/otd2erfL/better-end-4.0.10.jar",
-    "hashes": {
-      "sha1": "1e7da7e351af26a912934d05b0aa77e5f6c4d139",
-      "sha512": "98773d700d35dd9ad5ca89a2de661f62ff4d3e9b126b751de0aa4cdf0256d166eab746bb87edc0e2b2fac03e7eb77eade7b6890792a7d2a8dda6a475566299a7"
-    }
-  },
-  "source": {
-    "type": "modrinth",
-    "modId": "gc8OEnCC",
-    "versionId": "otd2erfL",
-    "ignoreUpdates": false
-  }
-}

src/universal/mods/betternether.hm.json

@@ -1,21 +0,0 @@
-{
-  "formatVersion": 1,
-  "displayName": "BetterNether",
-  "enabled": true,
-  "version": {
-    "name": "9.0.9",
-    "size": 23134254,
-    "fileName": "better-nether-9.0.9.jar",
-    "downloadUrl": "https://cdn.modrinth.com/data/MpzVLzy5/versions/9kJblF2V/better-nether-9.0.9.jar",
-    "hashes": {
-      "sha1": "ee7275b0d3f627520c9d17dd3c942ec82ca093a7",
-      "sha512": "f14d528cfec6762d4e687d7c9477e215e06dfa76966578a8d8d90a82316604d5432690d4cd9cac94c40a2d8da38c911cc7c186dc66080ba346f45da1b308bb5a"
-    }
-  },
-  "source": {
-    "type": "modrinth",
-    "modId": "MpzVLzy5",
-    "versionId": "9kJblF2V",
-    "ignoreUpdates": false
-  }
-}

src/universal/mods/incendium.hm.json

@@ -0,0 +1,21 @@
+{
+  "formatVersion": 1,
+  "displayName": "Incendium",
+  "enabled": true,
+  "version": {
+    "name": "5.3.3",
+    "size": 4341300,
+    "fileName": "Incendium_1.20.2_v5.3.3.jar",
+    "downloadUrl": "https://cdn.modrinth.com/data/ZVzW5oNS/versions/QL8CxhjY/Incendium_1.20.2_v5.3.3.jar",
+    "hashes": {
+      "sha1": "8653e534ac7e430c60b0e128b4ebad35fa22b6dc",
+      "sha512": "a5a866b866b7bb12d2466dc575d68ec0840fd6bc5606647576249c23026e812d864fdfac38246e5394cfde024c8b34a96d496e7832f94143439ee3dc5aba24d0"
+    }
+  },
+  "source": {
+    "type": "modrinth",
+    "modId": "ZVzW5oNS",
+    "versionId": "QL8CxhjY",
+    "ignoreUpdates": false
+  }
+}

src/universal/mods/nullscape.hm.json

@@ -0,0 +1,21 @@
+{
+  "formatVersion": 1,
+  "displayName": "Nullscape",
+  "enabled": true,
+  "version": {
+    "name": "1.2.3",
+    "size": 318199,
+    "fileName": "Nullscape_1.20.2_v1.2.3.jar",
+    "downloadUrl": "https://cdn.modrinth.com/data/LPjGiSO4/versions/w4mEZnbU/Nullscape_1.20.2_v1.2.3.jar",
+    "hashes": {
+      "sha1": "6d0d32276415eb11b4c58f7ccd61145aa83095e4",
+      "sha512": "62359d5d286128509a652cb47f55ba4bbb68d0c3618d51077a928828811e74fafddf263fae18ae66e26f4c670fcfc97238a5077a34ae8b7e1a2f0b31db785639"
+    }
+  },
+  "source": {
+    "type": "modrinth",
+    "modId": "LPjGiSO4",
+    "versionId": "w4mEZnbU",
+    "ignoreUpdates": false
+  }
+}

src/universal/mods/remove-terralith-intro-message.hm.json

@@ -0,0 +1,21 @@
+{
+  "formatVersion": 1,
+  "displayName": "Remove Terralith Intro Message",
+  "enabled": true,
+  "version": {
+    "name": "1.0+mod",
+    "size": 95951,
+    "fileName": "remove-terralith-intro-message-1.0.jar",
+    "downloadUrl": "https://cdn.modrinth.com/data/sk4iFZGy/versions/2jAppOW4/remove-terralith-intro-message-1.0.jar",
+    "hashes": {
+      "sha1": "80b617cdd2dcd973779bb7ce273dc06a4639ca6e",
+      "sha512": "a18e826a7739d16af46f138c016213cad3f5df16eddf765082ab66d63f76f46c0e0434028eefe1cf5020b37c2993f55bb42c883b864b67bc448029536b89600f"
+    }
+  },
+  "source": {
+    "type": "modrinth",
+    "modId": "sk4iFZGy",
+    "versionId": "2jAppOW4",
+    "ignoreUpdates": false
+  }
+}

src/universal/mods/terralith.hm.json

@@ -0,0 +1,21 @@
+{
+  "formatVersion": 1,
+  "displayName": "Terralith",
+  "enabled": true,
+  "version": {
+    "name": "2.4.8",
+    "size": 2485047,
+    "fileName": "Terralith_1.20.2_v2.4.8.jar",
+    "downloadUrl": "https://cdn.modrinth.com/data/8oi3bsk5/versions/1hOeraaL/Terralith_1.20.2_v2.4.8.jar",
+    "hashes": {
+      "sha1": "4b20f50554edbb75945bd15a5db989afffc79709",
+      "sha512": "24e0346e06d658671967120cf9a27576e665e98a4197dccd4f52cbbc21f373b5d3b58b89a6f362306c5c9d145d8c9390fbf8ff5c2b23c0232b8fb4fdf0fc83c7"
+    }
+  },
+  "source": {
+    "type": "modrinth",
+    "modId": "8oi3bsk5",
+    "versionId": "1hOeraaL",
+    "ignoreUpdates": false
+  }
+}