Merge branch 'develop'

.gitignore

@@ -261,3 +261,5 @@ config/terraforged/performance_internal.conf
 config/sidebar_buttons.json
 config/emi.css
 emi.json
+config/compressedcreativity-client.toml
+config/AdvancedBackups-client.properties

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica9"
 $CLIENT_NAME = "Enigmatica9"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "1.21.0"
+$MODPACK_VERSION = "1.22.0"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "1.20.1"
+$LAST_MODPACK_VERSION = "1.21.0"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS
@@ -177,7 +177,9 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
 	"ae2/client.json",
 	"explorerscompass-client.toml",
 	"theoneprobe-client.toml",
-	"sidebar_buttons.json"
+	"sidebar_buttons.json",
+	"compressedcreativity-client.toml",
+	"AdvancedBackups-client.properties"
 )
 
 $FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data", "local/ftbultimine", "local/ftbultimine-client.snbt", "resourcepacks")

changelogs/CHANGELOG.md

@@ -1,3 +1,40 @@
+### Enigmatica 9 v1.22.0
+
+### 🎁 New Mods Added
+
+-   [Compressed Creativity](https://www.curseforge.com/minecraft/mc-mods/compressedcreativity) (by [Lgmrszd](https://www.curseforge.com/members/lgmrszd/projects))
+
+### 🌟 Improvements
+
+-   [Expert] Massively buff Aura Infusion rewards [\#940](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/940)
+-   Add several new brewable potions, including higher tiers of some existing potions [\#943](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/943)
+-   [Expert] Remove dependencies on iron from a lot of decorative blocks [\#950](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/950)
+-   Aura will no longer cause wild grass growth on byg grass blocks [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   Added a bunch of conversion options for mossy variants [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   Added crafting recipes for many stone variants [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   [Expert] Motes now craft 1:1 with their potion to avoid leftovers [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   [Expert] Several Iron using recipes have been tweaked to adjust their gating [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   [Expert] Add a recipe for the new chunkloader upgrade for PNC drones [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
+-   [Expert] Processing Metal Shards now has an extra step involving the creation and use of Lacunar Acid [\#968](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/968)
+-   Add Aloe to the Market [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972)
+-   Add many shrooms to the Market [\#975](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/975)
+-   Add methods of obtaining various BYG soils for planting [\#975](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/975)
+-   Sporelings in the End may now drop end shrooms [\#975](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/975)
+
+### 🐛 Fixed Bugs
+
+-   [Expert] Add recipe for Ash Bricks [\#950](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/950)
+-   [Expert] Disable a coal gen that was missed [\#952](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/952)
+-   [Expert] Fixed typo in Storage Actuator quest in chapter 2 [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   Removed reference to step height bonus on Skyseeker's armor [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   Immersive Engineering Sawdust flooring changed to no longer conflict with thermal [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
+-   Crafting tables may now be converted to variants with the stonecutter. Variant shaped crafting recipes are removed. [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
+-   Remove conflicting furnace recipe. Furnaces are now only crafted with cobblestone [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
+-   Remove conflicting chest recipe. Vanilla chest may be crafted by converting any other chest. [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
+-   [Normal] Correct Thermal's quests regarding Fluxducts [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972)
+-   Fixed missing Apotheosis bosses [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972)
+-   Removed duplicate Cabbage seeds in the Market [\#975](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/975)
+
 ### Enigmatica 9 v1.21.0
 
 🚀 Forge-1.19.2-43.2.14 | [📜 Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/changelog_mods_1.20.1.md) | [📋 Modlist](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/modlist_1.20.1.md)

config/AdvancedBackups.properties

@@ -1,11 +1,16 @@
 #Enable or disable automatic backups.
-#Options : true, false   #Default : true,
+#Options : true, false   #Default : true
 config.advancedbackups.enabled=true
 
 #Whether to save before making a backup.
 #Options : true, false    #Default : true
 config.advancedbackups.save=true
 
+#Buffer size, in bytes, to use when reading / writing files. Higher will improve speeds, but increase memory usage.
+#Too high can cause an OOM. I'd advise against editing this unless you experience issues.
+#Range : 1-2147483647     #Default : 1048576
+config.advancedbackups.buffer=1048576
+
 #Whether to flush when making the aforementioned save. Can cause a lag spike, and is usually not required.
 #Unused prior to minecraft 1.16.
 #Options : true, false    #Default : false
@@ -19,12 +24,17 @@ config.advancedbackups.activity=true
 #Options : zip, differential, incremental    #Default : differential
 config.advancedbackups.type=differential
 
+#A list of files, relative paths within the world directory, to skip backing up.
+#Default : empty.
+config.advancedbackups.blacklist=session.lock
+
 #The absolute or relative path to the backup location.
 #Options : any file path. Default : ./backups
 config.advancedbackups.path=./backups
 
 #Minimum time between backups, in hours. This can prevent a shutdown backup from triggering immediately after a scheduled backup or similar situations.
-#Range : 0.25 - 500    #Default : 0.5
+#5 minutes = ~ 0.083 hours.
+#Range : 0.08 - 500    #Default : 0.5
 config.advancedbackups.frequency.min=0.5
 
 #Triggers a backup if none has already happened within this time. Can be combined with an uptime-based schedule.

config/bcc-common.toml

@@ -3,9 +3,9 @@
 [general]
 	#The CurseForge project ID for the modpack
 	#Range: > 0
-	modpackProjectID = 882461
+	modpackProjectID = 882461
 	#The name of the modpack
-	modpackName = "Enigmatica 9 Expert"
+	modpackName = "Enigmatica 9 Expert"
 	#The version of the modpack
 	modpackVersion = "1.21.0"
 	#Use the metadata.json to determine the modpack version

config/compressedcreativity-common.toml

@@ -0,0 +1,167 @@
+
+#General Configuration
+[general]
+	#If Copper Backtank has pneumatic capability in item form
+	backtank_compat_item = true
+	#If Copper Backtank has pneumatic capability in block form
+	backtank_compat_block = true
+	#If Pneumatic Chestplate (with charging upgrade) can provide air to Create tools
+	chestplate_compat = true
+	#Minimal Pneumatic Chestplate pressure required to act as Copper Backtank
+	#Range: 0.0 ~ 9.0
+	chestplate_min_pressure = 2.0
+
+#Machines Configuration
+[machines]
+
+	#Rotational Compressor
+	[machines.rotational_compressor]
+		#Max Stress Impact of the machine (at 256 rpm)
+		#Default value: 2048
+		#Range: > 0
+		stress = 2048
+		#Air Volume of the machine
+		#Default value: 5000
+		#Range: > 0
+		volume = 5000
+		#How much air this machine produces per tick if it is running at 128 rpm
+		#Default value: 10.0
+		#Range: 0.0 ~ 999999.0
+		base_production = 10.0
+		#Pressure Tier of the machine
+		#All but CUSTOM one match Pressure Tiers from PNC:R
+		#Allowed Values: TIER_ONE, TIER_ONE_HALF, TIER_TWO, CUSTOM
+		pressure_tier = "TIER_ONE"
+
+		#Values from Custom Air Pressure for this machine
+		[machines.rotational_compressor.custom_pressure]
+			#Danger Pressure of the machine
+			#Default value: 5.0
+			#Range: 0.0 ~ 20.0
+			danger_pressure = 5.0
+			#Additional Critical Pressure of the machine.
+			#Actual Critical Pressure is the sum of this value and Danger Pressure
+			#Default value: 2.0
+			#Range: 0.0 ~ 20.0
+			critical_pressure = 2.0
+
+	#Air Blower
+	[machines.air_blower]
+		#Air Volume of the machine
+		#Default value: 500
+		#Range: > 0
+		volume = 500
+		#Pressure required by machine to operate
+		#Default value: 0.5
+		#Range: 0.0 ~ 20.0
+		work_pressure = 0.5
+		#Pressure required for double processing speed
+		#Default value: 4.8
+		#Range: 0.0 ~ 20.0
+		overwork_pressure = 4.8
+		#Air Usage per Bar (total air usage = this value * current pressure)
+		#Range: 0.0 ~ 999999.0
+		air_usage_per_bar = 4.0
+		#Pressure Tier of the machine
+		#All but CUSTOM one match Pressure Tiers from PNC:R
+		#Allowed Values: TIER_ONE, TIER_ONE_HALF, TIER_TWO, CUSTOM
+		pressure_tier = "TIER_ONE"
+
+		#Values from Custom Air Pressure for this machine
+		[machines.air_blower.custom_pressure]
+			#Danger Pressure of the machine
+			#Default value: 5.0
+			#Range: 0.0 ~ 20.0
+			danger_pressure = 5.0
+			#Additional Critical Pressure of the machine.
+			#Actual Critical Pressure is the sum of this value and Danger Pressure
+			#Default value: 2.0
+			#Range: 0.0 ~ 20.0
+			critical_pressure = 2.0
+
+	#Industrial Air Blower
+	[machines.industrial_air_blower]
+		#Air Volume of the machine
+		#Default value: 1000
+		#Range: > 0
+		volume = 1000
+		#Pressure Tier of the machine
+		#All but CUSTOM one match Pressure Tiers from PNC:R
+		#Allowed Values: TIER_ONE, TIER_ONE_HALF, TIER_TWO, CUSTOM
+		pressure_tier = "TIER_ONE_HALF"
+
+		#Values from Custom Air Pressure for this machine
+		[machines.industrial_air_blower.custom_pressure]
+			#Danger Pressure of the machine
+			#Default value: 5.0
+			#Range: 0.0 ~ 20.0
+			danger_pressure = 5.0
+			#Additional Critical Pressure of the machine.
+			#Actual Critical Pressure is the sum of this value and Danger Pressure
+			#Default value: 2.0
+			#Range: 0.0 ~ 20.0
+			critical_pressure = 2.0
+
+	#Compressed Air Engine
+	[machines.compressed_air_engine]
+		#Max/Worl Stress Capacity of the machine (at 256 rpm)
+		#Default value: 1024
+		#Range: > 0
+		stress = 1024
+		#Air Volume of the machine
+		#Default value: 1000
+		#Range: > 0
+		volume = 1000
+		#Air usage when working
+		#Default value: 20.0
+		#Range: 0.0 ~ 999999.0
+		air_usage_work = 40.0
+		#Air usage when idle
+		#Default value: 40.0
+		#Range: 0.0 ~ 999999.0
+		air_usage_idle = 80.0
+		#Pressure required to operate
+		#Default value: 3.0
+		#Range: 0.0 ~ 20.0
+		work_pressure = 3.0
+		#Pressure Tier of the machine
+		#All but CUSTOM one match Pressure Tiers from PNC:R
+		#Allowed Values: TIER_ONE, TIER_ONE_HALF, TIER_TWO, CUSTOM
+		pressure_tier = "TIER_ONE"
+
+		#Values from Custom Air Pressure for this machine
+		[machines.compressed_air_engine.custom_pressure]
+			#Danger Pressure of the machine
+			#Default value: 5.0
+			#Range: 0.0 ~ 20.0
+			danger_pressure = 5.0
+			#Additional Critical Pressure of the machine.
+			#Actual Critical Pressure is the sum of this value and Danger Pressure
+			#Default value: 2.0
+			#Range: 0.0 ~ 20.0
+			critical_pressure = 2.0
+
+	#Heater
+	[machines.heater]
+		#At what temperature the heater will start cooling down
+		#Range: > 0
+		starting_temperature = 100
+		#Temperature coefficient increase, this much heat is consumed for each degree over starting temperature
+		#Range: 0.0 ~ 100.0
+		temperature_coefficient = 0.1
+		#At what temperature the heater will be considered as passive heat source for Steam Engine (like a campfire)
+		#Range: > 0
+		temperature_passive = 100
+		#At what temperature the heater will be considered as active heat source for Steam Engine and Basin recipes (like a fueled Blaze Burner)
+		#Range: > 0
+		temperature_kindled = 200
+		#At what temperature the heater will be considered as seething (like a Blaze Burner fed with Blaze Cake)
+		#Range: > 0
+		temperature_seething = 300
+		#Thermal capacity of a Heater
+		#Range: 0.0 ~ 100.0
+		thermal_capacity = 2.0
+		#Thermal resistance of a Heater
+		#Range: 0.0 ~ 100.0
+		thermal_resistance = 1.0
+

config/configswapper/expert/config/naturesaura-common.toml

@@ -26,6 +26,8 @@
 		]
 	#The amount of blocks that can be between two Aura Field Creators for them to be connectable and work together
 	fieldCreatorRange = 24
+	#Blocks that are exept from being fertilized by the plant boost effect. Each entry needs to be formatted as modid:block, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).
+	plantBoostExceptions = ["byg:lush_grass_block", "byg:overgrown_dacite", "byg:overgrown_stone", "byg:overgrown_netherrack"]
 	#The Aura to RF ratio used by the RF converter, read as aura*ratio = rf
 	auraToRFRatio = 0.025
 	#The maximum amount of animals that can be around the powder of fertility before it stops working

config/configswapper/expert/serverconfig/charginggadgets-server.toml

@@ -0,0 +1,7 @@
+
+#General settings
+[general]
+	#Maximum power for the Charging Station
+	#Range: > 0
+	chargerMaxEnergy = 1
+

config/configswapper/normal/config/naturesaura-common.toml

@@ -16,6 +16,8 @@
 	additionalProjectiles = []
 	#The amount of blocks that can be between two Aura Field Creators for them to be connectable and work together
 	fieldCreatorRange = 24
+	#Blocks that are exept from being fertilized by the plant boost effect. Each entry needs to be formatted as modid:block, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).
+	plantBoostExceptions = ["byg:lush_grass_block", "byg:overgrown_dacite", "byg:overgrown_stone", "byg:overgrown_netherrack"]
 	#The Aura to RF ratio used by the RF converter, read as aura*ratio = rf
 	auraToRFRatio = 0.05
 	#The maximum amount of animals that can be around the powder of fertility before it stops working

config/configswapper/normal/serverconfig/charginggadgets-server.toml

@@ -0,0 +1,7 @@
+
+#General settings
+[general]
+	#Maximum power for the Charging Station
+	#Range: > 0
+	chargerMaxEnergy = 1000000
+

config/curios-client.toml

@@ -18,4 +18,6 @@
 	#The corner for the Curios GUI button
 	#Allowed Values: TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT
 	buttonCorner = "TOP_LEFT"
+	#Set to true to enable the Curios GUI button
+	enableButton = true
 

config/ftbquests/quests/chapters/chapter_one.snbt

@@ -1952,7 +1952,7 @@
 			description: [
 				"There’s far more to magic than just the showy bits of wiggling one’s fingers and making sparkly lights. Indeed, a great deal can be done through the arcane arts with the right materials and processes. "
 				""
-				"Long ago, specialists in transmutation and conjuration discovered ways of creating vast networks of crystalline conduits capable of wonderous feats. They kept hordes of materials stored away in dimensional arrays and could use them to create nearly anything on a whim. "
+				"Long ago, specialists in transmutation and conjuration discovered ways of creating vast networks of crystalline conduits capable of wondrous feats. They kept hordes of materials stored away in dimensional arrays and could use them to create nearly anything on a whim. "
 				""
 				"That all seems rather far out of reach for now, but simple transport seems viable at least."
 				""

config/ftbquests/quests/chapters/chapter_two.snbt

@@ -667,7 +667,7 @@
 		}
 		{
 			dependencies: ["00B21E64DEFACB40"]
-			description: ["The beating heart of a magical energy network, the elementals bound into the ME Controller direct the flow of magical energies between the various components of the network, enabling a witch to perform the most wonderous of feats imaginable. "]
+			description: ["The beating heart of a magical energy network, the elementals bound into the ME Controller direct the flow of magical energies between the various components of the network, enabling a witch to perform the most wondrous of feats imaginable. "]
 			icon: "ae2:controller"
 			id: "330C200F0F0243FC"
 			rewards: [
@@ -981,7 +981,7 @@
 		{
 			dependencies: ["7001144C71F0E0BC"]
 			description: [
-				"As suspected, with even a minimal amount of stabilization, the Matrix can store a wonderous quantity of items. "
+				"As suspected, with even a minimal amount of stabilization, the Matrix can store a wondrous quantity of items. "
 				""
 				"More experimentation with planar stabilizers is certainly warranted. "
 			]

config/ftbquests/quests/chapters/natures_aura.snbt

@@ -1305,7 +1305,7 @@
 				""
 				"● Skyseeker’s Blade: Inflicts Levitation on its target."
 				""
-				"● Skyseeker’s Armor: When wearing a full set, grants a speed bonus and the ability to step up one block."
+				"● Skyseeker’s Armor: When wearing a full set, grants a speed bonus."
 			]
 			icon: {
 				Count: 1b

config/ftbquests/quests/chapters/natures_aura_expert.snbt

@@ -1261,7 +1261,7 @@
 				""
 				"● Skyseeker’s Blade: Inflicts Levitation on its target."
 				""
-				"● Skyseeker’s Armor: When wearing a full set, grants a speed bonus and the ability to step up one block."
+				"● Skyseeker’s Armor: When wearing a full set, grants a speed bonus and the ability to glide as if wearing Elytra."
 			]
 			icon: {
 				Count: 1b