Merge pull request #2987 from NillerMedDild/develop

0.5.10

Author: NielsPilgaard

.gitignore

@@ -182,3 +182,4 @@ config/contentcreatorintegration/default/constants.json
 config/fml.toml
 config/storagedrawers-client.toml
 config/blue_skies-client.toml
+config/dummmmmmy-client.toml

automation/.build.json

@@ -2,7 +2,7 @@
     "packAuthor": "NillerMedDild",
     "minecraftVersion": "1.16.5",
     "modLoader": "forge",
-    "modLoaderVersion": "36.1.31",
+    "modLoaderVersion": "36.2.2",
     "includes": [
         "building_gadgets_patterns",
         "config",

automation/remove-client-mods.ps1

@@ -1,7 +1,9 @@
 # List of Mods to remove for the Server
 # In the format @("filename", "filename")
 $CLIENT_MODS_TO_REMOVE_FROM_SERVER_FILES = @(
+	"connectivity"
 	"Ding", 
+	"EntityCulling",
 	"ReAuth", 
 	"moreoverlays",
 	"Neat", 

automation/settings.cfg

@@ -14,5 +14,5 @@ HIGH_CPU_PRIORITY=0;
 
 MODPACK_NAME=Enigmatica 6;
 MCVER=1.16.5;
-FORGEVER=36.2.1;
+FORGEVER=36.2.2;
 FORGEURL=DISABLE;

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "0.5.9"
+$MODPACK_VERSION = "0.5.10"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.8"
+$LAST_MODPACK_VERSION = "0.5.9"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS
@@ -147,7 +147,8 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
 	"contentcreatorintegration/contentcreatorintegration-common.toml",
 	"contentcreatorintegration/default/constants.json",
 	"storagedrawers-client.toml",
-	"blue_skies-client.toml"
+	"blue_skies-client.toml",
+	"dummmmmmy-client.toml"
 )
 
 $FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data", "local/ftbultimine")

changelogs/CHANGELOG.md

@@ -1,66 +1,67 @@
+### Enigmatica 6 v0.5.10
+
+_Using Forge-1.16.5-36.2.2_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.10.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.10.md)_
+
+**Changes/Improvements**
+
+-   Un-silenced thunder and the Wandering Trader
+-   RefinedStorage: Increased Controller Energy Buffer size from 32000 to 250000 (This change applies itself by resetting the RefinedStorage server config to the pack default)
+
 ### Enigmatica 6 v0.5.9
 
 _Using Forge-1.16.5-36.2.1_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.9.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.9.md)_
 
 **New Mods**
 
-- [Connectivity](https://www.curseforge.com/minecraft/mc-mods/connectivity)
-- [Materialis](https://www.curseforge.com/minecraft/mc-mods/materialis)
-- [Redstone Pen](https://www.curseforge.com/minecraft/mc-mods/redstone-pen)
-- [Shift n Scroll on Mac (Forge Only)](https://www.curseforge.com/minecraft/mc-mods/shift-n-scroll-on-mac)
-
-
+-   [Connectivity](https://www.curseforge.com/minecraft/mc-mods/connectivity)
+-   [Materialis](https://www.curseforge.com/minecraft/mc-mods/materialis)
+-   [Redstone Pen](https://www.curseforge.com/minecraft/mc-mods/redstone-pen)
+-   [Shift n Scroll on Mac (Forge Only)](https://www.curseforge.com/minecraft/mc-mods/shift-n-scroll-on-mac)
 
 **Changes/Improvements**
 
-- Add missing osmium items to ore multiplication quests [\#2899](https://github.com/NillerMedDild/Enigmatica6/pull/2899) ([MuteTiefling](https://github.com/MuteTiefling))
-- Blacklist Pharaohs from Apotheosis spawners [\#2878](https://github.com/NillerMedDild/Enigmatica6/pull/2878) ([MuteTiefling](https://github.com/MuteTiefling))
-- Expand Alt Material crafting, fix stoneworks crafting, make osmium available through IE's Excavator [\#2856](https://github.com/NillerMedDild/Enigmatica6/pull/2856) ([MuteTiefling](https://github.com/MuteTiefling))
-- Fix Immersive Petroleum asphalt recipes to use tags [\#2875](https://github.com/NillerMedDild/Enigmatica6/pull/2875) ([MuteTiefling](https://github.com/MuteTiefling))
-- Implement Planks to Sticks / Sticks to Sawdust Recipes in Various Sawing Devices [\#2865](https://github.com/NillerMedDild/Enigmatica6/issues/2865)
-- More Special Bees [\#2896](https://github.com/NillerMedDild/Enigmatica6/pull/2896) ([TemperedFool](https://github.com/TemperedFool))
-- Remove Duplicate Dim Shard processing recipe from Enrichment Chamber [\#2879](https://github.com/NillerMedDild/Enigmatica6/pull/2879) ([MuteTiefling](https://github.com/MuteTiefling))
-- Set up tags for adding to sylph items [\#2860](https://github.com/NillerMedDild/Enigmatica6/issues/2860)
-- Tag Update: Adds Chipped, Chisel, and Architect's Palette to valid apiary, and many more [\#2858](https://github.com/NillerMedDild/Enigmatica6/pull/2858) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Add missing osmium items to ore multiplication quests [\#2899](https://github.com/NillerMedDild/Enigmatica6/pull/2899) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Blacklist Pharaohs from Apotheosis spawners [\#2878](https://github.com/NillerMedDild/Enigmatica6/pull/2878) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Expand Alt Material crafting, fix stoneworks crafting, make osmium available through IE's Excavator [\#2856](https://github.com/NillerMedDild/Enigmatica6/pull/2856) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Fix Immersive Petroleum asphalt recipes to use tags [\#2875](https://github.com/NillerMedDild/Enigmatica6/pull/2875) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Implement Planks to Sticks / Sticks to Sawdust Recipes in Various Sawing Devices [\#2865](https://github.com/NillerMedDild/Enigmatica6/issues/2865)
+-   More Special Bees [\#2896](https://github.com/NillerMedDild/Enigmatica6/pull/2896) ([TemperedFool](https://github.com/TemperedFool))
+-   Remove Duplicate Dim Shard processing recipe from Enrichment Chamber [\#2879](https://github.com/NillerMedDild/Enigmatica6/pull/2879) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Set up tags for adding to sylph items [\#2860](https://github.com/NillerMedDild/Enigmatica6/issues/2860)
+-   Tag Update: Adds Chipped, Chisel, and Architect's Palette to valid apiary, and many more [\#2858](https://github.com/NillerMedDild/Enigmatica6/pull/2858) ([MuteTiefling](https://github.com/MuteTiefling))
 
 **Fixed Bugs**
 
-- "an" grammar mistake [\#2857](https://github.com/NillerMedDild/Enigmatica6/issues/2857)
-- \[0.4.8\] See through / fully transparent quark slate block when placing using building gadget [\#1890](https://github.com/NillerMedDild/Enigmatica6/issues/1890)
-- Create builds - blocks vanish when contraptions stop. [\#2862](https://github.com/NillerMedDild/Enigmatica6/issues/2862)
-- Ender Block sharing recipe, prevents Compact Machine Wall from being crafted [\#2892](https://github.com/NillerMedDild/Enigmatica6/issues/2892)
-- Framed Block crashes game when broken with chisel block in [\#2853](https://github.com/NillerMedDild/Enigmatica6/issues/2853)
-- Integrated Crafting operations stuck 0.5.6 [\#2824](https://github.com/NillerMedDild/Enigmatica6/issues/2824)
-- lapis chunks show 2 recipes in the mekanism enricher [\#2868](https://github.com/NillerMedDild/Enigmatica6/issues/2868)
-- Modular Router Placer Conflict with Claimed Chunks [\#2838](https://github.com/NillerMedDild/Enigmatica6/issues/2838)
-- NPE issue in Terraforged [\#2870](https://github.com/NillerMedDild/Enigmatica6/issues/2870)
-- Packing sawdust into sawdust blocks in the MultiServo Press [\#2863](https://github.com/NillerMedDild/Enigmatica6/issues/2863)
-- Quark's Deepslate and Cobbled Deepslate are not registered for cobblegens [\#2846](https://github.com/NillerMedDild/Enigmatica6/issues/2846)
-- Render Problem with Quark Blocks [\#2146](https://github.com/NillerMedDild/Enigmatica6/issues/2146)
-- simple machine frame quest requires mob slaughter factory [\#2848](https://github.com/NillerMedDild/Enigmatica6/issues/2848)
-- Thermal mode change key does not work [\#2854](https://github.com/NillerMedDild/Enigmatica6/issues/2854)
-- Thermal Series and Integrated Dynamics Machine/Crafting-Terminal Negative TPS Interaction [\#2810](https://github.com/NillerMedDild/Enigmatica6/issues/2810)
-- unable to craft `material stonework factory` with crafting table variants [\#2850](https://github.com/NillerMedDild/Enigmatica6/issues/2850)
-- Warped Nylium missing tag resourcefulbees:valid\_apiary [\#2886](https://github.com/NillerMedDild/Enigmatica6/issues/2886)
-
-
+-   "an" grammar mistake [\#2857](https://github.com/NillerMedDild/Enigmatica6/issues/2857)
+-   \[0.4.8\] See through / fully transparent quark slate block when placing using building gadget [\#1890](https://github.com/NillerMedDild/Enigmatica6/issues/1890)
+-   Create builds - blocks vanish when contraptions stop. [\#2862](https://github.com/NillerMedDild/Enigmatica6/issues/2862)
+-   Ender Block sharing recipe, prevents Compact Machine Wall from being crafted [\#2892](https://github.com/NillerMedDild/Enigmatica6/issues/2892)
+-   Framed Block crashes game when broken with chisel block in [\#2853](https://github.com/NillerMedDild/Enigmatica6/issues/2853)
+-   Integrated Crafting operations stuck 0.5.6 [\#2824](https://github.com/NillerMedDild/Enigmatica6/issues/2824)
+-   lapis chunks show 2 recipes in the mekanism enricher [\#2868](https://github.com/NillerMedDild/Enigmatica6/issues/2868)
+-   Modular Router Placer Conflict with Claimed Chunks [\#2838](https://github.com/NillerMedDild/Enigmatica6/issues/2838)
+-   NPE issue in Terraforged [\#2870](https://github.com/NillerMedDild/Enigmatica6/issues/2870)
+-   Packing sawdust into sawdust blocks in the MultiServo Press [\#2863](https://github.com/NillerMedDild/Enigmatica6/issues/2863)
+-   Quark's Deepslate and Cobbled Deepslate are not registered for cobblegens [\#2846](https://github.com/NillerMedDild/Enigmatica6/issues/2846)
+-   Render Problem with Quark Blocks [\#2146](https://github.com/NillerMedDild/Enigmatica6/issues/2146)
+-   simple machine frame quest requires mob slaughter factory [\#2848](https://github.com/NillerMedDild/Enigmatica6/issues/2848)
+-   Thermal mode change key does not work [\#2854](https://github.com/NillerMedDild/Enigmatica6/issues/2854)
+-   Thermal Series and Integrated Dynamics Machine/Crafting-Terminal Negative TPS Interaction [\#2810](https://github.com/NillerMedDild/Enigmatica6/issues/2810)
+-   unable to craft `material stonework factory` with crafting table variants [\#2850](https://github.com/NillerMedDild/Enigmatica6/issues/2850)
+-   Warped Nylium missing tag resourcefulbees:valid_apiary [\#2886](https://github.com/NillerMedDild/Enigmatica6/issues/2886)
 
 ### Enigmatica 6 v0.5.8
 
 _Using Forge-1.16.5-36.2.1_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.8.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.8.md)_
 
-
-
 **Note to users of automatic git updating**
 
 The `start-automated-server` scripts have been updated, please override the ones you have in the instance root with the ones in the automation folder.
 
-
-
 **Bug Fixes**
 
-- \[0.5.7\] Sophisticated Backpacks incompatible with Tinker's Construct Crafting Station [\#2837](https://github.com/NillerMedDild/Enigmatica6/issues/2837)
-- You are unable to craft Percision Mechanisms in 0.5.7 [\#2835](https://github.com/NillerMedDild/Enigmatica6/issues/2835) (Fixed by [TemperedFool](https://github.com/TemperedFool))
+-   \[0.5.7\] Sophisticated Backpacks incompatible with Tinker's Construct Crafting Station [\#2837](https://github.com/NillerMedDild/Enigmatica6/issues/2837)
+-   You are unable to craft Percision Mechanisms in 0.5.7 [\#2835](https://github.com/NillerMedDild/Enigmatica6/issues/2835) (Fixed by [TemperedFool](https://github.com/TemperedFool))
 
 ### Enigmatica 6 v0.5.7
 

config/Mekanism/general.toml

@@ -7,7 +7,7 @@
 	#Peak processing rate for the Solar Neutron Activator. Note: It can go higher than this value in some extreme environments.
 	maxSolarNeutronActivatorRate = 64
 	#Any mod ids added to this list will not be able to have any of their blocks, picked up by the cardboard box. For example: ["mekanism"]
-	cardboardModBlacklist = ["refinedstorage", "tetra", "storagedrawers", "lootr", "extrastorage", "astralsorcery"]
+	cardboardModBlacklist = ["refinedstorage", "tetra", "storagedrawers", "lootr", "extrastorage", "astralsorcery", "waystones"]
 	#Disable to make the anchor upgrade not do anything.
 	allowChunkloading = true
 	#How much heat energy is created from one Joule of regular energy in the Resistive Heater.

config/abnormals_core-common.toml

@@ -1,10 +1,6 @@
 
 #Common only settings for Abnormals Core, this will affect all depending mods
 [common]
-	#If Quark Sign Editing should be enabled; Default: True
-	quarkSignEditing = true
-	#If Quark Sign Editing requires an empty hand to edit; Default: False
-	signEditingRequiresEmptyHand = false
 
 	#Compatibility with Quark's poisonous potatoes feature
 	[common.poisonousPotatoCompat]

config/advancedperipherals-common.toml

@@ -1,5 +1,4 @@
 
-#No comment
 [Restrictions]
 	#The max range of the player detector functions. If anyone use a higher range, the detector will use this max range
 	#Range: 0 ~ 100000000
@@ -14,7 +13,6 @@
 	#Range: > 0
 	nbtStorageMaxSize = 1048576
 
-#No comment
 [Features]
 	#Enable the Chat Box or not.
 	enableChatBox = true
@@ -28,7 +26,7 @@
 	enableEnvironmentDetector = true
 	#Enable the Chunky Turtle or not.
 	enableChunkyTurtle = true
-	#Enable the debug mode, you should only enable it, if a developer say it or something does not work.
+	#Enable the debug mode. You should only enable it, if a developer say it or something does not work.
 	enableDebugMode = false
 	#Enable the Energy Detector or not.
 	enableEnergyDetector = true
@@ -54,7 +52,6 @@
 	#Defines default chatbox prefix
 	defaultChatBoxPrefix = "AP"
 
-#No comment
 [operations]
 	#Range: > 1000
 	digCooldown = 1000
@@ -99,7 +96,6 @@
 	#Range: > 1000
 	chatMessageCooldown = 10000
 
-#No comment
 [metaphysics]
 	#Defines energy to fuel rate
 	#Range: > 575
@@ -123,9 +119,13 @@
 	overpoweredTier2AutomataCoreInteractionRadius = 6
 	#Range: 1 ~ 32
 	overpoweredTier2AutomataCoreMaxFuelConsumptionRate = 4
+	#Defines max warp point stored in warp core. Mostly need to not allow NBT overflow error
+	#Range: > 1
+	endAutomataCoreWarpPointLimit = 64
 
-#No comment
 [world]
 	#Enable the villager structures for the computer scientist.
 	enableVillagerStructures = true
+	#Gives the ap documentation to new players on a world.
+	givePlayerBookOnJoin = false
 

config/ars_nouveau-common.toml

@@ -26,7 +26,7 @@
 	#Range: 0 ~ 200
 	whunterWeight = 8
 	#Should the Wilden Hunter attack animals?
-	hunterHuntsAnimals = true
+	hunterHuntsAnimals = false
 	#Should the Wilden Stalker attack animals?
 	stalkerHuntsAnimals = false
 	#Should the Wilden Defender attack animals?

config/ars_nouveau/light.toml

@@ -14,4 +14,7 @@
 	#Limits the number of times a given augment may be applied to a given effect
 	#Example entry: "amplify=5"
 	augment_limits = []
+	#Potion duration, in seconds
+	#Range: > 0
+	potion_time = 30
 

config/bwncr-common.toml

@@ -1,13 +1,13 @@
 
 [General]
 	#Silence the wandering trader's ambient sound.
-	silenceTrader = true
+	silenceTrader = false
 	#Silence the server-wide Wither spawn and death broadcast sounds.
 	silenceWither = true
 	#Silence the server-wide Ender Dragon Death broadcast sound.
 	silenceDragon = true
 	#Silence the server-wide Thunder broadcast sound caused by the Lightning event
-	silenceLightning = true
+	silenceLightning = false
 	#If enabled the console will load up spam showing what sounds are being received and whether or not they are being canceled
 	debugMode = false
 	#A list of sounds to silence, discoverable with the toggle command /listen 

config/clickadv-common.toml

@@ -0,0 +1,5 @@
+
+["Config category"]
+	#Whether to show all advancements in local player chat
+	showAllInLocalChat = true
+