Merge pull request #20 from AllTheMods/staging

Staging
AllTheMods · Nov 7, 2021 · 8811729 · 8811729
2 parents 362498b + 7c165ca
commit 8811729
Show file tree

Hide file tree

Showing 28 changed files with 4,409 additions and 613 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -26,6 +26,8 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 2.1.4
+        - 2.1.2
         - 2.1.0
         - other
     validations:

diff --git a/.github/ISSUE_TEMPLATE/crash.yaml b/.github/ISSUE_TEMPLATE/crash.yaml
@@ -25,6 +25,8 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 2.1.4
+        - 2.1.2
         - 2.1.0
         - other
     validations:

diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
@@ -21,5 +21,5 @@
 [packversionminrev]
 	#Pack Minor Version Revision : X
 	#Range: 0 ~ 32768
-	minorrev = 2
+	minorrev = 4
 
diff --git a/config/dynview-common.toml b/config/dynview-common.toml
@@ -2,7 +2,7 @@
 ["Dynamic Chunk View Distance Settings"]
 	#The maximum chunk view distance allowed to use. Set to the max a player could benefit from. Default: 20
 	#Range: 1 ~ 200
-	maxChunkViewDist = 20
+	maxChunkViewDist = 10
 	#The average tick time to stabilize the chunk view distance around. Setting it higher than 50ms is not advised, as after 50ms the TPS will go below 20. Default: 45ms
 	#Range: 10 ~ 100
 	meanAvgTickTime = 45

diff --git a/config/feywild/client.json5 b/config/feywild/client.json5
@@ -1,8 +1,11 @@
 {
+  // Whether feywild music should be played in the fey biomes
+  "biome_music": true,
+
   // Wether Fey Flowers particles should spawn.
   "flower_particles": true,
 
-  // Whether Feywild should replace the main menu
+  // Whether Feywild should replace the main menu and music
   "replace_menu": false,
 
   // Whether tree particles should spawn.