Merge pull request #4113 from EnigmaticaModpacks/develop

0.5.25
EnigmaticaModpacks · Jan 23, 2022 · 267dff9 · 267dff9
2 parents 37a38bb + ed15b74
commit 267dff9
Show file tree

Hide file tree

Showing 52 changed files with 2,106 additions and 250 deletions.
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 = "0.5.24"
+$MODPACK_VERSION = "0.5.25"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.23"
+$LAST_MODPACK_VERSION = "0.5.24"
 
 # =====================================================================//
 #  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 = "alpha"
+$CLIENT_RELEASE_TYPE = "beta"
 
 #=====================================================================//
 #  DEPENDENCIES URL

diff --git a/building_gadgets_patterns/masterful_machinery/stellar_neutron_activator.json b/building_gadgets_patterns/masterful_machinery/stellar_neutron_activator.json
diff --git a/config/Advancedperipherals/metaphysics.toml b/config/Advancedperipherals/metaphysics.toml
@@ -0,0 +1,32 @@
+
+#Config for metaphysics
+[Metaphysics]
+	#Defines energy to fuel rate
+	#Range: > 575
+	energyToFuelRate = 575
+	enableWeakAutomataCore = true
+	enableEndAutomataCore = true
+	enableHusbandryAutomataCore = true
+	#Defines max warp point stored in warp core. Mostly need to not allow NBT overflow error
+	#Range: > 1
+	endAutomataCoreWarpPointLimit = 64
+	#Chance that overpowered automata will break after rotation cycle
+	#Range: 0.0 ~ 1.0
+	overpoweredAutomataBreakChance = 0.002
+	#Range: 1 ~ 64
+	tier1AutomataCoreInteractionRadius = 2
+	#Range: 1 ~ 32
+	tier1AutomataCoreMaxFuelConsumptionRate = 2
+	#Range: 1 ~ 64
+	tier2AutomataCoreInteractionRadius = 4
+	#Range: 1 ~ 32
+	tier2AutomataCoreMaxFuelConsumptionRate = 3
+	#Range: 1 ~ 64
+	overpoweredTier1AutomataCoreInteractionRadius = 4
+	#Range: 1 ~ 32
+	overpoweredTier1AutomataCoreMaxFuelConsumptionRate = 3
+	#Range: 1 ~ 64
+	overpoweredTier2AutomataCoreInteractionRadius = 6
+	#Range: 1 ~ 32
+	overpoweredTier2AutomataCoreMaxFuelConsumptionRate = 4
+
diff --git a/config/Advancedperipherals/peripherals.toml b/config/Advancedperipherals/peripherals.toml
@@ -133,3 +133,7 @@
 		#Range: > 1000
 		chatMessageCooldown = 1000
 
+	[Peripherals.Compass_Turtle]
+		#Enable the compass turtle or not.
+		enableCompassTurtle = true
+
diff --git a/config/configswapper/expert/serverconfig/occultism-server.toml b/config/configswapper/expert/serverconfig/occultism-server.toml
@@ -6,9 +6,9 @@
 	#The amount of slots the storage stabilizer tier 2 provides.
 	stabilizerTier2Slots = 512
 	#The amount of slots the storage stabilizer tier 3 provides.
-	stabilizerTier3Slots = 1024
+	stabilizerTier3Slots = 2048
 	#The amount of slots the storage stabilizer tier 4 provides.
-	stabilizerTier4Slots = 2048
+	stabilizerTier4Slots = 4096
 	#The amount of slots the storage actuator provides.
 	controllerBaseSlots = 128
 	#The stack size the storage actuator uses.
@@ -72,7 +72,7 @@
 		#The amount of blocks the spirit will obtain per mining operation
 		rollsPerOperation = 1
 		#The amount of mining operations the spirit can perform before breaking.
-		durability = 1000
+		durability = 100
 
 	#Miner Spirit Settings
 	[dimensional_mineshaft.miner_djinni_ores]
@@ -81,7 +81,7 @@
 		#The amount of blocks the spirit will obtain per mining operation
 		rollsPerOperation = 2
 		#The amount of mining operations the spirit can perform before breaking.
-		durability = 5000
+		durability = 50
 
 #Item Settings
 [items]

diff --git a/config/configswapper/normal/serverconfig/occultism-server.toml b/config/configswapper/normal/serverconfig/occultism-server.toml
@@ -6,9 +6,9 @@
 	#The amount of slots the storage stabilizer tier 2 provides.
 	stabilizerTier2Slots = 512
 	#The amount of slots the storage stabilizer tier 3 provides.
-	stabilizerTier3Slots = 1024
+	stabilizerTier3Slots = 2048
 	#The amount of slots the storage stabilizer tier 4 provides.
-	stabilizerTier4Slots = 2048
+	stabilizerTier4Slots = 4096
 	#The amount of slots the storage actuator provides.
 	controllerBaseSlots = 128
 	#The stack size the storage actuator uses.

diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini
@@ -290,3 +290,5 @@ masterfulmachinery:machine_process_advanced_assembly_table_structure
 masterfulmachinery:machine_process_auto_iridescent_altar_structure
 masterfulmachinery:machine_structure_advanced_assembly_table
 masterfulmachinery:machine_structure_auto_iridescent_altar
+masterfulmachinery:machine_process_stellar_neutron_activator_structure
+masterfulmachinery:machine_structure_stellar_neutron_activator
diff --git a/config/masterful_machinery/controllers/advanced_assembly_table.json b/config/masterful_machinery/controllers/advanced_assembly_table.json
@@ -7,7 +7,7 @@
             "type": "masterfulmachinery:items",
             "name": "Item",
             "id": "item",
-            "textureOverride": "kubejs:block/radiator",
+            "textureOverride": "immersiveengineering:block/metal_decoration/radiator",
             "data": {
                 "rows": 3,
                 "columns": 3
@@ -17,7 +17,7 @@
             "type": "masterfulmachinery:pncr_pressure",
             "name": "High Pressure",
             "id": "high_pressure",
-            "textureOverride": "kubejs:block/radiator",
+            "textureOverride": "immersiveengineering:block/metal_decoration/radiator",
             "data": {
                 "volume": 120,
                 "dangerPressure": 20.0,

diff --git a/config/masterful_machinery/controllers/auto_iridescent_altar.json b/config/masterful_machinery/controllers/auto_iridescent_altar.json
@@ -1,6 +1,6 @@
 {
     "controllerId": "auto_iridescent_altar",
-    "textureOverride": "kubejs:block/storage_steel",
+    "textureOverride": "immersiveengineering:block/metal/storage_steel",
     "name": "Automated Iridescent Altar",
     "ports": [
         {

diff --git a/config/masterful_machinery/controllers/stellar_neutron_activator.json b/config/masterful_machinery/controllers/stellar_neutron_activator.json
@@ -0,0 +1,32 @@
+{
+    "controllerId": "stellar_neutron_activator",
+    "textureOverride": "immersiveengineering:block/stone_decoration/hempcrete",
+    "name": "Stellar Neutron Activator",
+    "ports": [
+        {
+            "type": "masterfulmachinery:botania_mana",
+            "name": "Mana",
+            "id": "mana",
+            "textureOverride": "botania:block/mana_diamond_block",
+            "data": {
+                "capacity": 1000000
+            }
+        },
+        {
+            "type": "masterfulmachinery:energy",
+            "name": "FE",
+            "id": "energy",
+            "data": {
+                "capacity": 500000000
+            }
+        },
+        {
+            "type": "masterfulmachinery:fluids",
+            "name": "Fluid",
+            "id": "fluid",
+            "data": {
+                "capacity": 512000
+            }
+        }
+    ]
+}
diff --git a/kubejs/assets/enigmatica/lang/en_us.json b/kubejs/assets/enigmatica/lang/en_us.json
@@ -42,6 +42,8 @@
     "desc.immersiveengineering.info.mineral.horodric_digsite": "Horodric Digsite",
     "desc.immersiveengineering.info.mineral.naqada": "Naqada",
 
+    "ars_nouveau.school.blood": "Blood",
+
     "advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",
     "advancements.enigmatica.husbandry.tame_all_animals.description": "Tame every animal there is to tame!",
 

diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
@@ -78,6 +78,9 @@
 
     "item.kubejs.spirit_entropic_gateway": "Maxwellian Entropic Gateway",
     "item.kubejs.spirit_entropic_gateway.occultism_spirit_tooltip": "%s resides within, ever vigilant against entropy.",
+    "item.occultism.miner_foliot_unspecialized.tooltip": "%s will mine random blocks in the Otherworld.",
+    "item.occultism.miner_djinni_ores.tooltip": "%s will mine random ores in the Otherworld.",
+    "item.kubejs.fisher_foliot.occultism_spirit_tooltip": "%s will catch random fish from the Otherworld.",
     "item.magicfeather.magicfeather.occultism_spirit_tooltip": "%s is bound to this feather.",
     "item.bloodmagic.soulsword.occultism_spirit_tooltip": "%s is bound to this sword.",
     "item.bloodmagic.soulaxe.occultism_spirit_tooltip": "%s is bound to this axe.",
@@ -453,6 +456,13 @@
     "ritual.enigmatica.occultism/ritual/enchantment_library.interrupted": "Eek!",
     "ritual.enigmatica.occultism/ritual/enchantment_library.conditions": "Ook?",
 
+    "item.kubejs.craft_fisher_foliot": "Ritual: Summon Foliot Fisher",
+    "item.kubejs.craft_fisher_foliot.tooltip": "Summon Foliot Fisher into a magic lamp.",
+    "ritual.enigmatica.occultism/ritual/fisher_foliot.started": "Started binding foliot into the Magic Lamp.",
+    "ritual.enigmatica.occultism/ritual/fisher_foliot.finished": "Successfully bound foliot into the Magic Lamp.",
+    "ritual.enigmatica.occultism/ritual/fisher_foliot.interrupted": "Binding of foliot interrupted.",
+    "ritual.enigmatica.occultism/ritual/fisher_foliot.conditions": "Not all requirements for this ritual are met.",
+
     "item.kubejs.suffused_aluminum": "Mana Suffused Aluminum Chunk",
     "item.kubejs.suffused_cloggrum": "Mana Suffused Cloggrum Chunk",
     "item.kubejs.suffused_cobalt": "Mana Suffused Cobalt Chunk",
@@ -550,6 +560,8 @@
     "item.kubejs.basic_lenses_package": "Basic Lens Assembly Package",
     "item.kubejs.batch_unassembled_pcb": "Unassembled PCB Batch Etching Package",
 
+    "item.kubejs.soggy_treasure_box": "Soggy Treasure Box",
+
     "item.kubejs.pneumatic_helmet_package": "Pneumatic Helmet Assembly Package",
     "item.kubejs.pneumatic_helmet_assembly": "Unpacked Pneumatic Helmet Assembly Package",
     "item.kubejs.pneumatic_chestplate_package": "Pneumatic Chestplate Assembly Package",

diff --git a/kubejs/assets/kubejs/textures/block/radiator.png b/kubejs/assets/kubejs/textures/block/radiator.png
diff --git a/kubejs/assets/kubejs/textures/block/storage_steel.png b/kubejs/assets/kubejs/textures/block/storage_steel.png
diff --git a/kubejs/assets/kubejs/textures/item/magic_lamp.png b/kubejs/assets/kubejs/textures/item/magic_lamp.png
diff --git a/kubejs/client_scripts/item_modifiers/jei_add_subtypes.js b/kubejs/client_scripts/item_modifiers/jei_add_subtypes.js
@@ -1,5 +1,5 @@
-/*
 onEvent('jei.subtypes', (event) => {
+    /*
     /// regex to be supported next version. Can remove direct item calls then and just rely on the regex.
     const augmentItems = [
         /kubejs:\w+augment/,
@@ -17,7 +17,7 @@ onEvent('jei.subtypes', (event) => {
     augmentItems.forEach((augmentItem) => {
         event.useNBTKey(augmentItem, 'AugmentData');
     });
+    */
 
     event.useNBTKey('resourcefulbees:bee_jar', 'Entity');
 });
-*/
diff --git a/kubejs/client_scripts/item_modifiers/jei_descriptions.js b/kubejs/client_scripts/item_modifiers/jei_descriptions.js
@@ -191,7 +191,16 @@ onEvent('jei.information', (event) => {
             text: ['Place next to living coral to infuse.']
         },
         {
-            items: [/quark:\w+_crystal$/],
+            items: [
+                'quark:red_crystal',
+                'quark:orange_crystal',
+                'quark:yellow_crystal',
+                'quark:green_crystal',
+                'quark:blue_crystal',
+                'quark:indigo_crystal',
+                'quark:violet_crystal',
+                'quark:white_crystal',
+                'quark:black_crystal'],
             text: [
                 'Will grow up to four blocks tall if placed deep underground. Will emit particles while growing.',
                 ' ',
@@ -460,6 +469,7 @@ onEvent('jei.information', (event) => {
                 `This structure will be difficult to build by hand.`,
                 ` `,
                 `Use the included Building Gadgets patterns found in the "building_gadgets_patterns" folder of Enigmatica 6 instance folder.`,
+                ` `,
                 'May be rotated, but not mirrored.'
             ]
         }

diff --git a/kubejs/client_scripts/item_modifiers/tooltips.js b/kubejs/client_scripts/item_modifiers/tooltips.js
@@ -151,7 +151,7 @@ onEvent('item.tooltip', (event) => {
         {
             items: ['kubejs:medium_machinery_schematics'],
             text: [
-                Text.of(`Unlocks the ability to form the following strutures:`).blue(),
+                Text.of(`Unlocks the ability to form the following strutures in Expert:`).blue(),
                 Text.of(`- Diesel Generator`).aqua(),
                 Text.of(`- Excavator`).aqua(),
                 Text.of(`- Lightning Rod`).aqua(),
@@ -165,7 +165,7 @@ onEvent('item.tooltip', (event) => {
         {
             items: ['kubejs:heavy_machinery_schematics'],
             text: [
-                Text.of(`Unlocks the ability to form the following strutures:`).blue(),
+                Text.of(`Unlocks the ability to form the following strutures in Expert:`).blue(),
                 Text.of(`- Arc Furnace`).aqua(),
                 Text.of(`- Assembler`).aqua(),
                 Text.of(`- Automated Engineer's Workbench`).aqua(),
@@ -184,6 +184,10 @@ onEvent('item.tooltip', (event) => {
         {
             items: ['clockout:clockout_block'],
             text: [Text.of(`Outputs redstone when the player is online.`).aqua()]
+        },
+        {
+            items: ['kubejs:soggy_treasure_box'],
+            text: [Text.of(`The lock appears broken... What could be inside?`).darkAqua()]
         }
     ];