Merge branch 'develop'

automation/prepare-for-release.ps1

@@ -44,7 +44,6 @@ function Close-FixedIssues {
 function Merge-DevelopIntoMaster {
     git stash
     git checkout master
-    git reset
     git merge develop
     git checkout develop
     git merge master

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "1.1.0"
+$MODPACK_VERSION = "1.1.1"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "1.0.0"
+$LAST_MODPACK_VERSION = "1.1.0"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS

config/bloodmagic-common.toml

@@ -12,7 +12,7 @@
 	#Setting the value to 0 will blacklist it.
 	#Use the registry name of the entity followed by a ';' and then the value you want.
 	#Vanilla entities do not require the modid.
-	sacrificialValues = ["villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100", "parrot;300", "dummmmmmy:target_dummy;0", "ars_nouveau:whelp;0", "ars_nouveau:familiar_bookwyrm;0", "ars_nouveau:carbuncle;0", "ars_nouveau:familiar_carbuncle;0", "ars_nouveau:drygmy;0", "ars_nouveau:familiar_drygmy;0", "ars_nouveau:dummy;0", "ars_nouveau:familiar_jabberwog;0", "ars_nouveau:sylph;0", "ars_nouveau:familiar_sylph;0", "ars_nouveau:wixie;0", "ars_nouveau:familiar_wixie;0", "ars_nouveau:summon_horse;0", "ars_nouveau:summon_wolf;0", "ars_nouveau:ally_vex"]
+	sacrificialValues = ["villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100", "parrot;300", "dummmmmmy:target_dummy;0", "ars_nouveau:whelp;0", "ars_nouveau:familiar_bookwyrm;0", "ars_nouveau:carbuncle;0", "ars_nouveau:familiar_carbuncle;0", "ars_nouveau:drygmy;0", "ars_nouveau:familiar_drygmy;0", "ars_nouveau:dummy;0", "ars_nouveau:familiar_jabberwog;0", "ars_nouveau:sylph;0", "ars_nouveau:familiar_sylph;0", "ars_nouveau:wixie;0", "ars_nouveau:familiar_wixie;0", "ars_nouveau:summon_horse;0", "ars_nouveau:summon_wolf;0", "ars_nouveau:ally_vex;0"]
 	#State that the dungeon spawning ritual can only be activated when using a Creative Activation Crystal.
 	#Used on servers for if you do not trust your players to not destroy other people's bases.
 	makeDungeonRitualCreativeOnly = false

config/ftbquests/quests/chapters/astral_sorcery_wip.snbt

@@ -813,22 +813,14 @@
 					item: "astralsorcery:wand"
 				}
 			]
-			rewards: [
-				{
-					id: "0000000000000BBC"
-					type: "item"
-					title: "Linking Tool"
-					item: "astralsorcery:linking_tool"
-				}
-				{
-					id: "0000000000000C5F"
-					type: "command"
-					title: "Scavenger's Delight"
-					icon: "kubejs:scavengers_delight"
-					command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_scavengers_delight"
-					player_command: false
-				}
-			]
+			rewards: [{
+				id: "0000000000000C5F"
+				type: "command"
+				title: "Scavenger's Delight"
+				icon: "kubejs:scavengers_delight"
+				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_scavengers_delight"
+				player_command: false
+			}]
 		}
 		{
 			x: 5.0d

config/ftbquests/quests/chapters/expert__tier_1_wip.snbt

@@ -293,7 +293,23 @@
 			tasks: [{
 				id: "0CDA65B3EB419AE4"
 				type: "item"
-				item: "kubejs:superheated_steel_ingot"
+				title: "Superheated Steel"
+				item: {
+					id: "itemfilters:or"
+					Count: 1b
+					tag: {
+						items: [
+							{
+								id: "kubejs:superheated_steel_ingot"
+								Count: 1b
+							}
+							{
+								id: "kubejs:superheated_steel_block"
+								Count: 1b
+							}
+						]
+					}
+				}
 			}]
 		}
 		{
@@ -305,7 +321,23 @@
 			tasks: [{
 				id: "1B2F44B4F78173E4"
 				type: "item"
-				item: "kubejs:hot_compressed_iron_ingot"
+				title: "Hot Compressed Iron"
+				item: {
+					id: "itemfilters:or"
+					Count: 1b
+					tag: {
+						items: [
+							{
+								id: "kubejs:hot_compressed_iron_ingot"
+								Count: 1b
+							}
+							{
+								id: "kubejs:hot_compressed_iron_block"
+								Count: 1b
+							}
+						]
+					}
+				}
 			}]
 		}
 		{

config/ftbquests/quests/chapters/expert__tier_2_wip.snbt

@@ -500,7 +500,7 @@
 			description: [
 				"A time-honored tradition, dowsing has its origins deep in the hazy past of early magic, predating even written history. Though it’s more commonly known in terms of water dowsing, it was once used to find all manner of things, from plants, to minerals, or even strong magical field lines. "
 				""
-				"The Resonating Wand is particularly suited to finding Rock Crystals deep in the earth. "
+				"The Resonating Wand is particularly suited to finding Rock Crystals deep in the earth. Hold it at night and the locations of these crystals will be revealed by soft lights."
 			]
 			dependencies: ["4C5CCC780A4B07A7"]
 			id: "269CB5E2F7130224"

config/ftbquests/quests/chapters/hidden_quests.snbt

@@ -94,29 +94,6 @@
 				stage: "master_blood_orb"
 			}]
 		}
-		{
-			x: -8.5d
-			y: -5.0d
-			id: "38F3D549DAFF2CD0"
-			tasks: [{
-				id: "5B43BCA2F385EE07"
-				type: "item"
-				item: {
-					id: "bloodmagic:soulgemlesser"
-					Count: 1b
-					tag: {
-						souls: 256.0d
-					}
-				}
-			}]
-			rewards: [{
-				id: "6D36A253466E98C9"
-				type: "gamestage"
-				title: "Lesser Tartaric Gem"
-				auto: "invisible"
-				stage: "lesser_tartaric_gem"
-			}]
-		}
 		{
 			x: -7.0d
 			y: -5.0d
@@ -171,5 +148,49 @@
 				stage: "heavy_machinery_schematics"
 			}]
 		}
+		{
+			x: -8.5d
+			y: -5.0d
+			id: "0D3EFC571F771C0B"
+			tasks: [{
+				id: "2CAEC5249040770D"
+				type: "item"
+				item: {
+					id: "itemfilters:or"
+					Count: 1b
+					tag: {
+						items: [
+							{
+								id: "bloodmagic:soulgemlesser"
+								Count: 1b
+								tag: {
+									souls: 256.0d
+								}
+							}
+							{
+								id: "bloodmagic:soulgemcommon"
+								Count: 1b
+								tag: {
+									souls: 1024.0d
+								}
+							}
+							{
+								id: "bloodmagic:soulgemgreater"
+								Count: 1b
+								tag: {
+									souls: 4096.0d
+								}
+							}
+						]
+					}
+				}
+			}]
+			rewards: [{
+				id: "7CBA6F3356BEE33B"
+				type: "gamestage"
+				auto: "invisible"
+				stage: "lesser_tartaric_gem"
+			}]
+		}
 	]
 }

config/ftbquests/quests/chapters/magic__adept.snbt

@@ -266,7 +266,7 @@
 			shape: "diamond"
 			description: [
 				""
-				"Knowledge once though lost has turned up in the most unexpected of places: the music of the denizens of the Undergarden. "
+				"Knowledge once thought lost has turned up in the most unexpected of places: the music of the denizens of the Undergarden. "
 				""
 				"Locate a Stoneborn and trade with them to obtain a sample of their traditional music. "
 			]

config/ftbquests/quests/chapters/tech_t3.snbt

@@ -395,5 +395,22 @@
 				item: "masterfulmachinery:advanced_assembly_table_controller"
 			}]
 		}
+		{
+			x: 2.5d
+			y: 9.0d
+			shape: "gear"
+			description: [
+				"Though based on simple technologies, this massive machine can churn out industrial quantities of Deuterium quickly enough to meet the needs of a Fusion Reactor.  "
+				""
+				"Note: This multiblock expects water underneath it with the legs submerged right up to the base of the platform. As such, it is best built as an offshore platform. Be wary of kelp and other plant life, as its presence will break the structure "
+			]
+			dependencies: ["16DE48989A21D643"]
+			id: "5E61BE9DA7DA1FEC"
+			tasks: [{
+				id: "621697B1EC42D23F"
+				type: "item"
+				item: "masterfulmachinery:industrial_deuterium_plant_controller"
+			}]
+		}
 	]
 }