Merge pull request #1084 from NillerMedDild/develop

0.3.10 Part 2: Enigmatic Boogaloo

changelogs/CHANGELOG.md

@@ -1,3 +1,25 @@
+### Enigmatica 6 v0.3.10
+
+_Using Forge-1.16.5-36.0.1_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.3.10.txt)_
+
+
+
+**Now on Minecraft 1.16.5! You can update existing worlds without issues.**
+
+
+
+**Bug Fixes**
+
+- KubeJS script errors on servers running 0.3.9 [\#1050](https://github.com/NillerMedDild/Enigmatica6/issues/1050)
+- Broken Undergarden [\#1049](https://github.com/NillerMedDild/Enigmatica6/issues/1049)
+- Multiblock Centrifuge Bug [\#1048](https://github.com/NillerMedDild/Enigmatica6/issues/1048)
+- Occultism Ores Generating [\#1045](https://github.com/NillerMedDild/Enigmatica6/issues/1045)
+- Different Brass Alloy Recipes [\#1043](https://github.com/NillerMedDild/Enigmatica6/issues/1043)
+- Wither Bee keeps killing itself \(Fixed by setting size to 1 temporarily\) [\#1003](https://github.com/NillerMedDild/Enigmatica6/issues/1003)
+- ResourcefulBees getting stuck in apiary walls [\#900](https://github.com/NillerMedDild/Enigmatica6/issues/900)
+- Create Empty Placeholders for Removed Scripts [\#1059](https://github.com/NillerMedDild/Enigmatica6/pull/1059) ([MuteTiefling](https://github.com/MuteTiefling))
+- Hide from JEI script fix and Akashic Tome fixes [\#1047](https://github.com/NillerMedDild/Enigmatica6/pull/1047) ([Merlo17](https://github.com/Merlo17))
+
 ### Enigmatica 6 v0.3.9
 
 _Using Forge-1.16.4-35.1.37_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.3.9.txt)_

config/ftbquests/quests/chapters/tetra.snbt

@@ -731,7 +731,7 @@
 			description: [
 				"Netherite Ingots will get you to tier 6. ",
 				"",
-				"Nou're basically a walking Forge, Congrats!"
+				"You're basically a walking Forge, Congratulations!"
 			],
 			dependencies: [I;2181],
 			dependency_requirement: "all_started",

config/immersiveengineering-common.toml

@@ -1,13 +1,6 @@
 #A list of preferred Mod IDs that results of IE processes should stem from, aka which mod you want the copper to come from.
 #This affects the ores dug by the excavator, as well as those crushing recipes that don't have associated IE items. This list is in oreder of priority.
 preferredOres = ["emendatusenigmatica", "minecraft", "immersiveengineering", "thermal", "create", "mekanism", "jaopca", "kubejs", "appliedenergistics2", "pneumaticcraft", "occultism", "tmechworks", "industrialforegoing", "botania", "quark", "pedestals"]
-#IMPORTANT NOTICE:
-#THIS IS ONLY THE COMMON CONFIG. It does not contain all the values adjustable for IE.
-#All modifiers for machines, all ore gen, the retrogen features and most other adjustable values have been moved to immersiveengineering-server.toml.
-#That file is PER WORLD, meaning you have to go into 'saves/<world name>/serverconfig' to adjust it. Those changes will then only apply for THAT WORLD.
-#You can then take that config file and put it in the 'defaultconfigs' folder to make it apply automatically to all NEW worlds you generate FROM THERE ON.
-#This may appear confusing to many of you, but it is a new sensible way to handle configuration, because the server configuration is synced when playing multiplayer.
-importantInfo = true
 
 [debug]
 	#A config setting to enable debug features. These features may vary between releases, may cause crashes, and are unsupported. Do not enable unless asked to by a developer of IE.
@@ -23,5 +16,4 @@ importantInfo = true
 #Setting any of these to false disables the respective compat
 [compat]
 	computercraft = true
-	crafttweaker = true
 

config/jei/recipe-category-sort-order.ini

@@ -1,9 +1,6 @@
 minecraft:crafting
-minecraft:anvil
 minecraft:blasting
 minecraft:brewing
-minecraft:campfire
-minecraft:fuel
 minecraft:furnace
 minecraft:smithing
 minecraft:smoking
@@ -23,7 +20,6 @@ cookingforblockheads:cow_jar
 farmingforblockheads:market
 immersiveengineering:alloysmelter
 immersiveengineering:arcfurnace
-immersiveengineering:arcfurnace_recycling
 immersiveengineering:blastfurnace
 immersiveengineering:blastfurnace_fuel
 immersiveengineering:bottlingmachine
@@ -119,22 +115,13 @@ thermal:bottler
 thermal:brewer
 thermal:centrifuge
 thermal:chiller
-thermal:compression_fuel
 thermal:crucible
 thermal:furnace
-thermal:insolator
-thermal:insolator_catalyst
-thermal:lapidary_fuel
-thermal:magmatic_fuel
-thermal:numismatic_fuel
 thermal:press
 thermal:pulverizer
-thermal:pulverizer_catalyst
 thermal:refinery
 thermal:sawmill
 thermal:smelter
-thermal:smelter_catalyst
-thermal:stirling_fuel
 industrialforegoing:laser_drill_fluid
 industrialforegoing:laser_drill_ore
 cobblegenrandomizer:basalt_gen
@@ -145,22 +132,6 @@ pneumaticcraft:spawner_extraction
 ars_nouveau:apparatus
 ars_nouveau:glyph_recipe
 transport:rail_workers_bench
-industrialforegoing:mycelial_crimed
-industrialforegoing:mycelial_culinary
-industrialforegoing:mycelial_death
-industrialforegoing:mycelial_disenchantment
-industrialforegoing:mycelial_ender
-industrialforegoing:mycelial_explosive
-industrialforegoing:mycelial_frosty
-industrialforegoing:mycelial_furnace
-industrialforegoing:mycelial_halitosis
-industrialforegoing:mycelial_magma
-industrialforegoing:mycelial_meatallurgic
-industrialforegoing:mycelial_netherstar
-industrialforegoing:mycelial_pink
-industrialforegoing:mycelial_potion
-industrialforegoing:mycelial_rocket
-industrialforegoing:mycelial_slimey
 portable_stonecutter:anvil_flattening
 astralsorcery:altar_attunement
 astralsorcery:altar_constellation
@@ -178,10 +149,6 @@ bloodmagic:arcfurnace
 bloodmagic:soulforge
 pedestals:cobblegen
 pedestals:cobblegensilk
-create:automatic_brewing
-create:automatic_packing
-create:automatic_shaped
-create:automatic_shapeless
 create:block_cutting
 create:blockzapper_upgrade
 create:crushing
@@ -215,3 +182,36 @@ farmersdelight:decomposition
 pedestals:fluid_to_xp
 mythicbotany:jei_category_infusion
 industrialforegoing:machine_produce
+immersiveengineering:arcfurnace_recycling
+minecraft:campfire
+minecraft:fuel
+minecraft:anvil
+create:automatic_brewing
+create:automatic_packing
+create:automatic_shaped
+create:automatic_shapeless
+industrialforegoing:mycelial_crimed
+industrialforegoing:mycelial_culinary
+industrialforegoing:mycelial_death
+industrialforegoing:mycelial_disenchantment
+industrialforegoing:mycelial_ender
+industrialforegoing:mycelial_explosive
+industrialforegoing:mycelial_frosty
+industrialforegoing:mycelial_furnace
+industrialforegoing:mycelial_halitosis
+industrialforegoing:mycelial_magma
+industrialforegoing:mycelial_meatallurgic
+industrialforegoing:mycelial_netherstar
+industrialforegoing:mycelial_pink
+industrialforegoing:mycelial_potion
+industrialforegoing:mycelial_rocket
+industrialforegoing:mycelial_slimey
+thermal:insolator
+thermal:compression_fuel
+thermal:insolator_catalyst
+thermal:lapidary_fuel
+thermal:magmatic_fuel
+thermal:numismatic_fuel
+thermal:pulverizer_catalyst
+thermal:smelter_catalyst
+thermal:stirling_fuel

config/pneumaticcraft-common.toml

@@ -31,6 +31,8 @@
 	#When an Oil Lake would be generated at the surface (see 'oil_generation_chance'), percentage chance that this will actually generate a lake. Set to 0 for no surface oil lakes, and fewer lakes overall. Higher values don't guarantee surface oil lakes, but make them more likely, as well as making oil lakes more likely overall. It is recommended to adjust this value in conjunction with 'oil_generation_chance'.
 	#Range: 0 ~ 100
 	surface_oil_generation_chance = 25
+	#Show particle trail indicating the currently-debugged drone's planned path
+	drone_debugger_path_particles = true
 
 ["Machine Properties"]
 	#Aerial Interface backwards compat: allow pre-0.8.0 behaviour of getting player's armor inventory from top face, even with Dispenser Upgrade installed

config/quark-common.toml

@@ -244,6 +244,9 @@
 		"Enable Chests" = false
 		"Enable Player Inventory In Chests" = false
 		"Enable Player Inventory" = false
+		#
+		#Play a click when sorting inventories using keybindings
+		"Satisfying Click" = true
 
 	[management.item_sharing]
 		"Render Items In Chat" = true

kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js

@@ -184,7 +184,11 @@ events.listen('recipes', function (event) {
         input: '#forge:ores/nickel',
         type: 'thermal:smelter'
     });
-
+    event.remove({
+        input: 'minecraft:fire_charge',
+        mod: 'thermal',
+        type: 'minecraft:crafting_shapeless'
+    });
     event.remove({ type: 'pedestals:pedestal_crushing', output: '#forge:dyes' });
     event.remove({ type: 'create:milling', output: '#forge:dyes' });
     event.remove({ type: 'create:crushing', output: '#forge:dyes' });