Merge pull request #3202 from AllTheMods/Staging

Release 1.9.2
AllTheMods · Jan 24, 2024 · 5ea8b1f · 5ea8b1f
2 parents 7a9d342 + 07cfb38
commit 5ea8b1f
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 30 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -26,6 +26,7 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 1.9.2
         - 1.9.1
         - 1.9.0
         - 1.8.28

diff --git a/.github/ISSUE_TEMPLATE/crash.yaml b/.github/ISSUE_TEMPLATE/crash.yaml
@@ -25,6 +25,7 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 1.9.2
         - 1.9.1
         - 1.9.0
         - 1.8.28

diff --git a/changelog/1.9.2.md b/changelog/1.9.2.md
@@ -0,0 +1,24 @@
+## Release 1.9.2
+
+### Mod Updates
+- embeddium-0.2.18+mc1.16.5.jar
+- industrial-foregoing-1.16.5-3.2.14.7-19.jar
+- JustEnoughCalculation-1.16.5-3.8.6.jar
+- mahoutsukai-1.16.5-v1.34.61.jar
+- mcw-fences-1.1.1-mc1.16.5forge.jar
+- mcw-windows-2.2.1-mc1.16.5forge.jar
+- modernfix-forge-5.12.0+mc1.16.5.jar
+- oculus-mc1.16.5-1.4.7.jar
+- RoadRunner-mc1.16.5-1.5.1.jar
+### Mod Removals
+- starlight-1.2.jar
+
+### Other Changes
+- fix Time in a Bottle quest
+- fix Ice Dragon and Fire Dragon biome quests
+- fix Zycraft quartz not obtainable from void miner
+- remove Starlight due to crash with Immersive Engineering
+- downgrade Just Enough Calculation to fix tooltip offset bug
+- update default config for Mahou Tsukai to new format (thanks to Laithur)
+  - If you want the updated config for existing worlds, you will need to
+    manually delete `saves/<save name>/serverconfig/mahoutsukai-server.toml`
diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
@@ -8,4 +8,4 @@
 [packversionmin]
 	minor = 9
 [packversionminrev]
-	minorrev = 1
+	minorrev = 2
diff --git a/config/brandon3055/DraconicEvolution.cfg b/config/brandon3055/DraconicEvolution.cfg
@@ -112,3 +112,7 @@
         >
     }
 }
+"Client" {
+    B:"fancyToolModels"=false
+    B:"toolShaders"=false
+}
diff --git a/config/ftbquests/quests/chapters/ice__fire.snbt b/config/ftbquests/quests/chapters/ice__fire.snbt
@@ -28,7 +28,7 @@
 			tasks: [{
 				id: "3C9F9DF2EE2307EA"
 				type: "biome"
-				biome: "allthemodium:basalt_delta"
+				biome: "allthemodium:basalt_deltas"
 			}]
 		}
 		{
@@ -54,7 +54,7 @@
 			tasks: [{
 				id: "66901FFCC62D852F"
 				type: "biome"
-				biome: "allthemodium:mountain"
+				biome: "allthemodium:mountains"
 			}]
 		}
 		{

diff --git a/config/ftbquests/quests/chapters/tips_and_tricks.snbt b/config/ftbquests/quests/chapters/tips_and_tricks.snbt
@@ -844,12 +844,12 @@
 			}]
 		}
 		{
-			title: "Time in A Bottle"
+			title: "Time in a Bottle"
 			x: 3.5d
 			y: 0.5d
 			subtitle: "The Sandman's Favorite Weapon"
 			description: [
-				"The Cloud in a Bottle stores time while it is in your inventory."
+				"The Time in a Bottle stores time while it is in your inventory."
 				""
 				"You can use the stored time on almost anything to increase the speed of the item. To do this, shift-right click on the item with the bottle in hand."
 				""
@@ -859,7 +859,7 @@
 			tasks: [{
 				id: "7FB116D85321DA44"
 				type: "item"
-				item: "quark:bottled_cloud"
+				item: "tiab:timeinabottle"
 			}]
 		}
 		{

diff --git a/config/oculus.properties b/config/oculus.properties
@@ -0,0 +1,5 @@
+enableDebugOptions=false
+disableUpdateMessage=true
+enableShaders=false
+maxShadowRenderDistance=32
+shaderPack=
diff --git a/defaultconfigs/mahoutsukai-server.toml b/defaultconfigs/mahoutsukai-server.toml
@@ -1,11 +1,14 @@
 [projection]
-	PROJECTION_BLACKLIST = ["silentgear", "draconicevolution", "mysticalagriculture", "thermal"]
-	POWER_CONSOLIDATION_TIERS = [10000.0, 50000.0, 500000.0, 1000000.0, 5000000.0]
-	POWER_CONSOLIDATION_TIER_UPGRADE_ITEM = ["atmadditions:atm_star"]
-	#Projection Enchantment Blacklist
-	PROJECTION_ENCHANTMENT_BLACKLIST = ["minecraft:mending", "forbiddenarcanus:indestructible", "apotheosis:life_mending", "naturesaura:aura_mending"]
-	#Projection items cannot be used in anvil
-	PROJECTION_ANVIL_CANCEL = true
+	[projection.projection]
+		PROJECTION_BLACKLIST = ["silentgear", "draconicevolution", "mysticalagriculture", "thermal"]
+		#Projection Enchantment Blacklist
+		PROJECTION_ENCHANTMENT_BLACKLIST = ["minecraft:mending", "forbiddenarcanus:indestructible", "apotheosis:life_mending", "naturesaura:aura_mending"]
+		#Projection items cannot be used in anvil
+		PROJECTION_ANVIL_CANCEL = true
+	[projection."power consolidation"]
+		POWER_CONSOLIDATION_TIERS = [10000.0, 50000.0, 500000.0, 1000000.0, 5000000.0]
+		POWER_CONSOLIDATION_TIER_UPGRADE_ITEM = ["atmadditions:atm_star"]
 [boundary]
-#Entities that won't be considered for the boundary
-	DRAIN_LIFE_ENTITY_BLACKLIST = ["dummmmmmy:target_dummy"]
+	[boundary."drain life"]
+		#Entities that won't be considered for the boundary
+		DRAIN_LIFE_ENTITY_BLACKLIST = ["dummmmmmy:target_dummy"]
diff --git a/kubejs/data/envirotech/envirotech/void_miner_drops/ore/zycraft_quartz.json b/kubejs/data/envirotech/envirotech/void_miner_drops/ore/zycraft_quartz.json
@@ -1,5 +1,5 @@
 {
-  "program": ["envirotech:ore", "envirotech:gemstone_ore"],
+  "programs": ["envirotech:ore", "envirotech:gemstone_ore"],
   "item": {"raw:item": "zycraft:quartz_crystal", "count":1},
   "config": [
     {

diff --git a/kubejs/server_scripts/mod_specific/applied_energistics2/applied_energistics2.js b/kubejs/server_scripts/mod_specific/applied_energistics2/applied_energistics2.js
@@ -48,13 +48,13 @@ onEvent('recipes', e => {
   }).id(`kubejs:appliedenergistics2/grinder/ender_pearl_dust`)
 
   e.recipes.lazierae2.centrifuge({
-    input: { tag: 'forge:flour_plants' },
+    input: [{ tag: 'forge:flour_plants' }],
     output: { item: 'pamhc2foodcore:flouritem' },
     processing_time: 160
   }).id(`kubejs:appliedenergistics2/pulse_centrifuge/flour`)
 
   e.recipes.lazierae2.centrifuge({
-    input: { tag: 'forge:ender_pearls' },
+    input: [{ tag: 'forge:ender_pearls' }],
     output: { item: 'thermal:ender_pearl_dust' },
     processing_time: 160
   }).id(`kubejs:appliedenergistics2/pulse_centrifuge/ender_pearl_dust`)
@@ -68,22 +68,11 @@ onEvent('recipes', e => {
     }
   }).id(`kubejs:appliedenergistics2/inscriber/printed_silicon`)
 
-  e.recipes.lazierae2.aggregator({
-    inputs: [
-      { input: { item: 'appliedenergistics2:sky_dust' } },
-      { input: { tag: 'forge:gems/diamond' } },
-      { input: { item: 'thermal:ender_pearl_dust' } }
-    ],
-    output: { item: 'lazierae2:resonating_gem' },
-    processing_time: 80
-  }).id(`kubejs:lazierae2/fluix_aggregator/resonating_gem`)
-
   e.recipes.create.milling('1x thermal:ender_pearl_dust', '#forge:ender_pearls').id(`kubejs:create/compat/ae2/milling/ender_pearl`)
   e.recipes.mekanism.crushing('1x thermal:ender_pearl_dust', '#forge:ender_pearls').id('kubejs:mekanism/compat/appliedenergistics2/ender_pearl_to_dust')
 
   removeRecipeByID(e, [
-    'appliedenergistics2:inscriber/silicon_print',
-    'lazierae2:fluix_aggregator/resonating_gem'
+    'appliedenergistics2:inscriber/silicon_print'
   ])
 
   removeRecipeByOutput(e, [
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ body: @@
           label: Modpack Version
           description: What version of the pack are you using?
           options:
+            - 1.9.2
             - 1.9.1
             - 1.9.0
             - 1.8.28
@@ Expand Down @@