Merge pull request #4501 from EnigmaticaModpacks/develop

1.1.0
EnigmaticaModpacks · Mar 26, 2022 · c3457fd · c3457fd
2 parents 80c54c1 + 62969ed
commit c3457fd
Show file tree

Hide file tree

Showing 134 changed files with 5,106 additions and 1,979 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -97,6 +97,8 @@ Re-run the script `update-server` whenever you want to update to a new modpack v
 
 ## Links
 
--   [CurseForge](https://www.curseforge.com/minecraft/modpacks/enigmatica6)
+-   [CurseForge (normal)](https://www.curseforge.com/minecraft/modpacks/enigmatica6)
+
+-   [CurseForge (expert)](https://www.curseforge.com/minecraft/modpacks/enigmatica6expert)
 
 -   [Discord](https://discord.gg/HnWNd7X)
diff --git a/automation/modpack-uploader.ps1 b/automation/modpack-uploader.ps1
@@ -417,6 +417,9 @@ if ($uploadExpertMode) {
     $SERVER_SETUP_CONFIG_PATH = "$SERVER_FILES_FOLDER/server-setup-config.yaml"
     $MODPACK_NAME = "Enigmatica6Expert"
     $CLIENT_NAME = "Enigmatica6Expert"
+    $CLIENT_ZIP_NAME = "$CLIENT_NAME-$MODPACK_VERSION"
+    $SERVER_ZIP_NAME = "$CLIENT_NAME`Server-$MODPACK_VERSION"
+    $LAST_MODPACK_ZIP_NAME = "$CLIENT_NAME-$LAST_MODPACK_VERSION"
     $CLIENT_FILE_DISPLAY_NAME = "Enigmatica 6 Expert $MODPACK_VERSION"
     $SERVER_FILE_DISPLAY_NAME = "Enigmatica 6 Expert Server $MODPACK_VERSION"
 

diff --git a/automation/settings.ps1 b/automation/settings.ps1
@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "1.0.0"
+$MODPACK_VERSION = "1.0.1"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.27"
+$LAST_MODPACK_VERSION = "1.0.0"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS
@@ -59,7 +59,7 @@ $CLIENT_CHANGELOG = "The Changelog is currently being written, it should be done
 $GAME_VERSIONS = @(8203)
 
 # Can be "alpha", "beta" or "release"
-$CLIENT_RELEASE_TYPE = "beta"
+$CLIENT_RELEASE_TYPE = "alpha"
 
 #=====================================================================//
 #  DEPENDENCIES URL
@@ -69,7 +69,7 @@ $CLIENT_RELEASE_TYPE = "beta"
 $CHANGELOG_GENERATOR_JAR = "ChangelogGenerator-2.0.0-pre10.jar"
 
 # File name of the latest https://github.com/MelanX/ModListCreator/releases
-$MODLIST_CREATOR_JAR = "ModListCreator-1.2.1.jar"
+$MODLIST_CREATOR_JAR = "ModListCreator-2.0.1.jar"
 
 #=====================================================================//
 #  CLIENT FILE SETTINGS

diff --git a/building_gadgets_patterns/masterful_machinery/enigmatic_tree_of_life.json b/building_gadgets_patterns/masterful_machinery/enigmatic_tree_of_life.json
diff --git a/building_gadgets_patterns/masterful_machinery/wicked_altar.json b/building_gadgets_patterns/masterful_machinery/wicked_altar.json
@@ -0,0 +1,78 @@
+{
+    "header": {
+        "version": "2.1.0",
+        "mc_version": "1.16.5",
+        "name": "Wicked Altar",
+        "author": "Enigmatica",
+        "bounding_box": {
+            "min_x": 0,
+            "min_y": 0,
+            "min_z": 0,
+            "max_x": 6,
+            "max_y": 3,
+            "max_z": 6
+        },
+        "material_list": {
+            "root_type": "buildinggadgets:entries",
+            "root_entry": [
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 34,
+                    "item": {
+                        "id": "eidolon:polished_planks"
+                    }
+                },
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 6,
+                    "item": {
+                        "id": "eidolon:stone_altar"
+                    }
+                },
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 1,
+                    "item": {
+                        "id": "eidolon:unholy_effigy"
+                    }
+                },
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 16,
+                    "item": {
+                        "id": "ars_nouveau:warding_stone"
+                    }
+                },
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 1,
+                    "item": {
+                        "id": "masterfulmachinery:wicked_altar_controller"
+                    }
+                },
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 1,
+                    "item": {
+                        "id": "masterfulmachinery:wicked_altar_fluid_port_fluids_input"
+                    }
+                },
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 1,
+                    "item": {
+                        "id": "masterfulmachinery:wicked_altar_item_port_items_input"
+                    }
+                },
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 1,
+                    "item": {
+                        "id": "masterfulmachinery:wicked_altar_item_port_items_output"
+                    }
+                }
+            ]
+        }
+    },
+    "body": "H4sIAAAAAAAAAM2VTY/TMBCGJ7Ed2myhSAghbnvmDkiVOPADQHtAYtlL5G2c1lrHrmyHbvfX449puwekbVGptqr6Th37mcn4jVMDjIG23PMaAF7XOQYCtRNWciUfhA0XoAbmPPeihvrKmpWwXgo3gqrjc6kXwLSxfgkjoN95L+A9t67RZvgt+DBbc9uGOY3zRotI+rcUVHDnT5NhC3knZGuU0bOVUdItRdusFNd37gjE5z5UJWw3qJ7Pl1ILu5mt5fwusLjy3DadGmTghvbk0DVSrwZ/fB8u1mHMKrNYiBaot0OooVzd70J9D6zjyqXhh/3wAw7vWvdme9epXbnM05Wzq0HvSztDOTuXrMWpXHJQhg9P7f/caG+NUuKQm9pSPz1FlV702VQxco0Z/JlNlcJn46lzVfP3w+jtNt+gl0ZtGtF1crE5Yr8/Hrvf5zlD9n1/Fvv9v8vZvcxceJwOe5mNgayMo4H5JYJLyB+SfgugkEfLIitBpQXgjPxlSUsoiqwlKkGlqCwpQkNYJU1hGbMWRf5fohJUispQq6QUyjIqA5K0wtJfxHoI8gnyg44inyCfIJ8gnyCfIJ/E5gQ+ie0mSS+gJFFTHop8ivygk8inyKfIp8inyKfID/oy8oO+ivyg09gcFpUlTf1kyGPIY8hjyEvz881PsbhphFW4rsJ1Fa6raqiWgrfCBsPw4BNjYfJt8OKHFJ0K1gjXb82gW0eA9lL/yk2N4fU25Pc3IapyGCeQHF5vR6W+SZscLKijBSc/02Fw+TUZe/zYz6Nko8vbQapozAVvF8K7WTv0/aZ5ZPs/u6gqOekJAAA\u003d"
+}
diff --git a/config/alexsmobs.toml b/config/alexsmobs.toml
@@ -96,7 +96,7 @@
 	#Whether the Clinging Potion effect should flip the screen. Warning: may cause nausea.
 	clingingFlipEffect = false
 	#List of items that seagulls cannot take from players.
-	seagullStealingBlacklist = []
+	seagullStealingBlacklist = ["artifacts:eternal_steak", "artifacts:everlasting_beef"]
 
 	[general.spawning]
 		#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn

diff --git a/config/alexsmobs/fly_spawns.json b/config/alexsmobs/fly_spawns.json
@@ -8,25 +8,8 @@
             },
             {
                 "type": "BIOME_CATEGORY",
-                "negate": true,
-                "value": "ocean"
-            },
-            {
-                "type": "BIOME_DICT",
-                "negate": true,
-                "value": "ocean"
-            }
-        ],
-        [
-            {
-                "type": "BIOME_DICT",
                 "negate": false,
-                "value": "atum"
-            },
-            {
-                "type": "REGISTRY_NAME",
-                "negate": true,
-                "value": "atum:oasis"
+                "value": "swamp"
             }
         ]
     ]

diff --git a/config/compote-common.toml b/config/compote-common.toml
@@ -9,7 +9,7 @@
 	#Whether or not the first piece of compostable material always raises the composter's level. Default[Vanilla] is true.
 	first_compost_always_succeeds = true
 	#Allow items to be inserted from any face of the composter. Default[Vanilla] is false.
-	insert_from_any_direction = false
+	insert_from_any_direction = true
 	#Allow items to be extracted from any face of the composter. Default[Vanilla] is false.
-	extract_from_any_direction = false
+	extract_from_any_direction = true
 
diff --git a/config/configswapper/expert/config/bhmenu-client.toml b/config/configswapper/expert/config/bhmenu-client.toml
@@ -8,5 +8,5 @@ description = "Click me to get your own server!"
 affiliate_id = "2214"
 #The id of this modpack.
 #(This is BH internal pack id; Find the id here: https://www.bisecthosting.com/partners/console.php)
-pack_id = "16819"
+pack_id = "17658"
 
diff --git a/config/defaultoptions/keybindings.txt b/config/defaultoptions/keybindings.txt
@@ -71,8 +71,8 @@ key_key.toggleVisible:key.keyboard.unknown:NONE
 key_key.immersiveengineering.magnetEquip:key.keyboard.s:NONE
 key_key.immersiveengineering.railgunZoom:key.mouse.middle:NONE
 key_key.immersiveengineering.chemthrowerSwitch:key.keyboard.unknown:NONE
-key_Strip World:key.keyboard.delete:NONE
-key_Dress World:key.keyboard.insert:NONE
+key_Strip World:key.keyboard.unknown:NONE
+key_Dress World:key.keyboard.unknown:NONE
 key_Open Config:key.keyboard.unknown:NONE
 key_Add Block:key.keyboard.unknown:NONE
 key_Remove Block:key.keyboard.unknown:NONE

diff --git a/config/ftbquests/quests/chapters/blood_magic_wip.snbt b/config/ftbquests/quests/chapters/blood_magic_wip.snbt
@@ -102,7 +102,7 @@
 				""
 				"It also serves as the basis for fueling your Soul Network, an ethereal web of souls that may be tapped into from anywhere."
 				""
-				"More fundamentally, the Altar will serve as a receptacle for transmuting objects with stored LP. To begin filling it, use the provided knife near it to drain some of your own blood into the Altar. "
+				"More fundamentally, the Altar will serve as a receptacle for transmuting objects with stored LP. To begin filling it, use a Sacrificial Knife near it to drain some of your own blood into the Altar. Another option is using the Dagger of Sacrifice to sacrifice mobs instead of your own health. "
 				""
 				"Once it is full, right click an item into the Altar to begin the transmutation process. Red particles mean the craft is proceeding normally, whereas grey particles mean there's not enough LP and the craft is losing progress. "
 				""
@@ -943,19 +943,6 @@
 					item: "bloodmagic:itemrouterfilterexact"
 					count: 2
 				}
-				{
-					id: "24C9A479B52447B3"
-					type: "item"
-					item: {
-						id: "bloodmagic:noderouter"
-						Count: 1b
-						tag: {
-							zCoord: 0
-							yCoord: 0
-							xCoord: 0
-						}
-					}
-				}
 			]
 		}
 		{

diff --git a/config/ftbquests/quests/chapters/create.snbt b/config/ftbquests/quests/chapters/create.snbt
@@ -1255,7 +1255,23 @@
 			tasks: [{
 				id: "0000000000000D2E"
 				type: "item"
-				item: "create:mechanical_piston"
+				title: "Mechanical Piston"
+				item: {
+					id: "itemfilters:or"
+					Count: 1b
+					tag: {
+						items: [
+							{
+								id: "create:mechanical_piston"
+								Count: 1b
+							}
+							{
+								id: "create:sticky_mechanical_piston"
+								Count: 1b
+							}
+						]
+					}
+				}
 			}]
 			rewards: [
 				{

diff --git a/config/ftbquests/quests/chapters/eidolon_wip.snbt b/config/ftbquests/quests/chapters/eidolon_wip.snbt
@@ -354,7 +354,24 @@
 			tasks: [{
 				id: "0000000000000E95"
 				type: "item"
-				item: "eidolon:worktable"
+				title: "Magic Workbench"
+				icon: "eidolon:worktable"
+				item: {
+					id: "itemfilters:or"
+					Count: 1b
+					tag: {
+						items: [
+							{
+								id: "masterfulmachinery:wicked_altar_controller"
+								Count: 1b
+							}
+							{
+								id: "eidolon:worktable"
+								Count: 1b
+							}
+						]
+					}
+				}
 			}]
 			rewards: [{
 				id: "0000000000000EC2"

diff --git a/config/ftbquests/quests/chapters/expert__tier_1_wip.snbt b/config/ftbquests/quests/chapters/expert__tier_1_wip.snbt
@@ -471,6 +471,7 @@
 				{
 					id: "4635A9AA2AFB35C4"
 					type: "item"
+					title: "xNet Cables"
 					item: {
 						id: "itemfilters:or"
 						Count: 1b

diff --git a/config/ftbquests/quests/chapters/expert__tier_2_wip.snbt b/config/ftbquests/quests/chapters/expert__tier_2_wip.snbt
@@ -389,16 +389,16 @@
 			x: -1.0d
 			y: -5.0d
 			description: [
-				"A workbench suitable for practitioners at all levels, made from the finest magical materials. "
+				"Historical records show a timeless debate raging amongst scholars dealing with the origins of Nebu and Godshards. There is no definitive answer to the question, but it’s plain that they’re deeply linked and flush with magical energy. "
 				""
-				"While somewhat rare in the overworld, the flax needed to make linen is very commonly found in Atum by breaking Oasis Grass."
+				"Godshards turn up in many magical crafts and obtaining them may seem daunting at first. However, they may be ‘grown’ quite simply by forming a Godforged block, breaking it with a Nebu Hammer, and smelting down the resulting relic in a Godforge using Lava as fuel."
 			]
 			dependencies: ["719AFD0C38BE19A2"]
 			id: "4C5CCC780A4B07A7"
 			tasks: [{
 				id: "5B0160F4F724F8F8"
 				type: "item"
-				item: "eidolon:worktable"
+				item: "atum:godforged_block"
 			}]
 		}
 		{

diff --git a/config/ftbquests/quests/chapters/gates_wip.snbt b/config/ftbquests/quests/chapters/gates_wip.snbt
@@ -24,6 +24,8 @@
 				""
 				""
 				"Please note that mods are rarely \"strictly\" gated - Some of their items will be obtainable prior to the Gate being unlocked, and not all things will be immediately obtainable once the Gate is unlocked."
+				""
+				"Also, while efforts have been made to alter manuals where possible, in some cases they’ll still show invalid recipes. Always refer to JEI as the primary source when it comes to crafting information. "
 			]
 			dependencies: ["0000000000000FEB"]
 			hide: true
@@ -170,7 +172,7 @@
 			tasks: [{
 				id: "0000000000000FD0"
 				type: "item"
-				item: "bloodmagic:demoncrucible"
+				item: "bloodmagic:soulforge"
 			}]
 		}
 		{

diff --git a/config/ftbquests/quests/chapters/hidden_quests.snbt b/config/ftbquests/quests/chapters/hidden_quests.snbt
@@ -101,14 +101,20 @@
 			tasks: [{
 				id: "5B43BCA2F385EE07"
 				type: "item"
-				item: "bloodmagic:soulforge"
+				item: {
+					id: "bloodmagic:soulgemlesser"
+					Count: 1b
+					tag: {
+						souls: 256.0d
+					}
+				}
 			}]
 			rewards: [{
 				id: "6D36A253466E98C9"
 				type: "gamestage"
-				title: "Hellfire Forge"
+				title: "Lesser Tartaric Gem"
 				auto: "invisible"
-				stage: "hellfire_forge"
+				stage: "lesser_tartaric_gem"
 			}]
 		}
 		{

diff --git a/config/ftbquests/quests/chapters/magic__adept.snbt b/config/ftbquests/quests/chapters/magic__adept.snbt
@@ -394,7 +394,6 @@
 			dependencies: [
 				"5602E77D09C84F56"
 				"43D3D565E295FA5D"
-				"57FFFBB68F2655C1"
 			]
 			id: "7BA120BEA495D354"
 			tasks: [
@@ -622,7 +621,7 @@
 			y: -0.5d
 			shape: "diamond"
 			description: ["Effective as it may be some practitioners find the practice of sacrificing other beings distasteful. The Adept learns early on to give of their own blood as sacrifice, and to draw upon the earth for healing. "]
-			dependencies: ["0000000000000FCD"]
+			dependencies: ["7BA120BEA495D354"]
 			id: "57FFFBB68F2655C1"
 			tasks: [{
 				id: "19014A262532EB8F"

diff --git a/config/ftbquests/quests/chapters/tech_t2.snbt b/config/ftbquests/quests/chapters/tech_t2.snbt
@@ -217,7 +217,11 @@
 		{
 			x: 5.0d
 			y: 2.0d
-			description: ["Solid fuel compressors are disabled entirely, instead relying on liquid fueled compressors to start."]
+			description: [
+				"Solid fuel compressors are disabled entirely, instead relying on liquid fueled compressors to start."
+				""
+				"Look closely at the recipes involved here. There are multiple paths available, but only one is viable at this stage. "
+			]
 			dependencies: ["67F7E4C19E39F9F3"]
 			id: "6EC89B2EB48331A5"
 			tasks: [

diff --git a/config/gamestages/known_stages.json b/config/gamestages/known_stages.json
@@ -1 +1,8 @@
-["hellfire_forge", "master_blood_orb", "red_chalk", "heavy_machinery_schematics", "medium_machinery_schematics"]
+[
+    "master_blood_orb",
+    "red_chalk",
+    "heavy_machinery_schematics",
+    "medium_machinery_schematics",
+    "lesser_tartaric_gem",
+    "disabled"
+]
diff --git a/config/integrateddynamics-common.toml b/config/integrateddynamics-common.toml
@@ -32,6 +32,8 @@
 		versionChecker = false
 		#If corrupted networks should automatically be restored on first tick.
 		recreateCorruptedNetworks = true
+		#The maximum frequency at which speach messages can be played in millis.
+		speachMaxFrequency = 1000
 
 [general]
 

diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini
@@ -298,3 +298,5 @@ masterfulmachinery:machine_process_enigmatic_tree_of_life_structure
 masterfulmachinery:machine_structure_enigmatic_tree_of_life
 masterfulmachinery:machine_process_industrial_deuterium_plant_structure
 masterfulmachinery:machine_structure_industrial_deuterium_plant
+masterfulmachinery:machine_structure_wicked_altar
+masterfulmachinery:machine_process_wicked_altar_structure