Merge pull request #2902 from NillerMedDild/develop

0.5.9
EnigmaticaModpacks · Aug 6, 2021 · 39c5e52 · 39c5e52
2 parents 22e3dcf + d4a590f
commit 39c5e52
Show file tree

Hide file tree

Showing 113 changed files with 3,252 additions and 1,971 deletions.
diff --git a/.gitignore b/.gitignore
@@ -181,3 +181,4 @@ config/contentcreatorintegration/contentcreatorintegration.toml
 config/contentcreatorintegration/default/constants.json
 config/fml.toml
 config/storagedrawers-client.toml
+config/blue_skies-client.toml
diff --git a/MODLIST.md b/MODLIST.md
@@ -1,4 +1,4 @@
-## Enigmatica6 - 0.5.7
+## Enigmatica6 - 0.5.8
 - [DustrialDecor-1.1.6.jar](https://www.curseforge.com/minecraft/mc-mods/dustrial-decor/files/3274678) (by [BlueDuckYT](https://www.curseforge.com/members/blueduckyt/projects))
 - [tanknull-2.3-1.16.4.jar](https://www.curseforge.com/minecraft/mc-mods/tank-null/files/3224872) (by [tfarecnim](https://www.curseforge.com/members/tfarecnim/projects))
 - [aiotbotania-1.16.5-1.8.0.jar](https://www.curseforge.com/minecraft/mc-mods/aiot-botania/files/3377560) (by [MelanX](https://www.curseforge.com/members/melanx/projects))
@@ -24,7 +24,7 @@
 - [Babel-1.0.5.jar](https://www.curseforge.com/minecraft/mc-mods/babel/files/3196072) (by [thenatekirby](https://www.curseforge.com/members/thenatekirby/projects))
 - [bwncr-1.16.4-3.9.16.jar](https://www.curseforge.com/minecraft/mc-mods/bad-wither-no-cookie-reloaded/files/3101531) (by [Kreezxil](https://www.curseforge.com/members/kreezxil/projects))
 - [BedBenefits-1.16.5-5.0.4.jar](https://www.curseforge.com/minecraft/mc-mods/bed-benefits/files/3348569) (by [DarkhaxDev](https://www.curseforge.com/members/darkhaxdev/projects))
-- [BetterAdvancements-1.16.5-0.1.1.111](https://www.curseforge.com/minecraft/mc-mods/better-advancements/files/3400299) (by [way2muchnoise](https://www.curseforge.com/members/way2muchnoise/projects))
+- [BetterAdvancements-1.16.5-0.1.1.115](https://www.curseforge.com/minecraft/mc-mods/better-advancements/files/3404330) (by [way2muchnoise](https://www.curseforge.com/members/way2muchnoise/projects))
 - [betterbiomeblend-1.16.4-1.2.3-forge.jar](https://www.curseforge.com/minecraft/mc-mods/better-biome-blend/files/3398525) (by [FionaTheMortal](https://www.curseforge.com/members/fionathemortal/projects))
 - [BetterBurning-1.16.5-6.0.7.jar](https://www.curseforge.com/minecraft/mc-mods/better-burning/files/3348573) (by [DarkhaxDev](https://www.curseforge.com/members/darkhaxdev/projects))
 - [betterendforge-1.16.4-1.6.0.jar](https://www.curseforge.com/minecraft/mc-mods/betterend-forge-port/files/3303188) (by [Beethoven92](https://www.curseforge.com/members/beethoven92/projects))
@@ -37,7 +37,7 @@
 - [Bountiful-1.16.4-3.3.1.jar](https://www.curseforge.com/minecraft/mc-mods/bountiful/files/3239647) (by [ejektaflex](https://www.curseforge.com/members/ejektaflex/projects))
 - [buildinggadgets-1.16.5-3.8.0.jar](https://www.curseforge.com/minecraft/mc-mods/building-gadgets/files/3205295) (by [Direwolf20](https://www.curseforge.com/members/direwolf20/projects))
 - [cc-tweaked-1.16.5-1.97.0.jar](https://www.curseforge.com/minecraft/mc-mods/cc-tweaked/files/3368207) (by [SquidDev](https://www.curseforge.com/members/squiddev/projects))
-- [caelus-forge-1.16.5-2.1.3.0.jar](https://www.curseforge.com/minecraft/mc-mods/caelus/files/3224510) (by [TheIllusiveC4](https://www.curseforge.com/members/theillusivec4/projects))
+- [caelus-forge-1.16.5-2.1.3.1.jar](https://www.curseforge.com/minecraft/mc-mods/caelus/files/3403876) (by [TheIllusiveC4](https://www.curseforge.com/members/theillusivec4/projects))
 - [cakechomps-forge-1.16.4-5.0.0.2.jar](https://www.curseforge.com/minecraft/mc-mods/cake-chomps/files/3112111) (by [TheIllusiveC4](https://www.curseforge.com/members/theillusivec4/projects))
 - [catjammies-1.1.0.jar](https://www.curseforge.com/minecraft/mc-mods/cat-jammies/files/3252734) (by [Buuz135](https://www.curseforge.com/members/buuz135/projects))
 - [cherishedworlds-forge-1.16.5-5.1.1.0.jar](https://www.curseforge.com/minecraft/mc-mods/cherished-worlds/files/3372376) (by [TheIllusiveC4](https://www.curseforge.com/members/theillusivec4/projects))
@@ -126,7 +126,7 @@
 - [FramedBlocks-2.9.2.jar](https://www.curseforge.com/minecraft/mc-mods/framedblocks/files/3397337) (by [XFactHD](https://www.curseforge.com/members/xfacthd/projects))
 - [GameStages-1.16.5-7.2.8.jar](https://www.curseforge.com/minecraft/mc-mods/game-stages/files/3348627) (by [DarkhaxDev](https://www.curseforge.com/members/darkhaxdev/projects))
 - [rsgauges-1.16.4-1.2.11.jar](https://www.curseforge.com/minecraft/mc-mods/redstone-gauges-and-switches/files/3390492) (by [wilechaote](https://www.curseforge.com/members/wilechaote/projects))
-- [geckolib-forge-1.16.5-3.0.42.jar](https://www.curseforge.com/minecraft/mc-mods/geckolib/files/3397755) (by [ThanosGecko](https://www.curseforge.com/members/thanosgecko/projects))
+- [geckolib-forge-1.16.5-3.0.43.jar](https://www.curseforge.com/minecraft/mc-mods/geckolib/files/3403668) (by [ThanosGecko](https://www.curseforge.com/members/thanosgecko/projects))
 - [glassential-forge-1.16.5-1.1.6.jar](https://www.curseforge.com/minecraft/mc-mods/glassential/files/3216634) (by [Lykrast](https://www.curseforge.com/members/lykrast/projects))
 - [gunswithoutroses-1.16.5-1.0.9.jar](https://www.curseforge.com/minecraft/mc-mods/guns-without-roses/files/3323323) (by [Lykrast](https://www.curseforge.com/members/lykrast/projects))
 - [ImmersiveEngineering-1.16.5-5.0.2-137](https://www.curseforge.com/minecraft/mc-mods/immersive-engineering/files/3377691) (by [BluSunrize](https://www.curseforge.com/members/blusunrize/projects))
@@ -252,7 +252,7 @@
 - [simplefarming-1.16.5-1.3.8.jar](https://www.curseforge.com/minecraft/mc-mods/simple-farming/files/3400041) (by [enemeez1](https://www.curseforge.com/members/enemeez1/projects))
 - [simplylight-1.16.4-1.1.3.jar](https://www.curseforge.com/minecraft/mc-mods/simply-light/files/3288992) (by [Flanks255](https://www.curseforge.com/members/flanks255/projects))
 - [smallships-1.16.5-1.9.1.jar](https://www.curseforge.com/minecraft/mc-mods/small-ships/files/3400403) (by [talhanation](https://www.curseforge.com/members/talhanation/projects))
-- [sophisticatedbackpacks-1.16.4-3.0.0.289.jar](https://www.curseforge.com/minecraft/mc-mods/sophisticated-backpacks/files/3399778) (by [P3pp3rF1y](https://www.curseforge.com/members/p3pp3rf1y/projects))
+- [sophisticatedbackpacks-1.16.5-3.0.3.297.jar](https://www.curseforge.com/minecraft/mc-mods/sophisticated-backpacks/files/3404306) (by [P3pp3rF1y](https://www.curseforge.com/members/p3pp3rf1y/projects))
 - [Sound Device Options 1.4.2](https://www.curseforge.com/minecraft/mc-mods/more-sound-config/files/3065530) (by [ichttt](https://www.curseforge.com/members/ichttt/projects))
 - [SpawnerFix-1.16.2-1.0.0.2.jar](https://www.curseforge.com/minecraft/mc-mods/spawner-fix/files/3161147) (by [MacTso](https://www.curseforge.com/members/mactso/projects))
 - [scaffoldingpower-1.16.5-1.3.0.jar](https://www.curseforge.com/minecraft/mc-mods/scaffolding-behavior/files/3211052) (by [Lothrazar](https://www.curseforge.com/members/lothrazar/projects))

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.8"
+$MODPACK_VERSION = "0.5.9"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.7"
+$LAST_MODPACK_VERSION = "0.5.8"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS
@@ -146,7 +146,8 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
 	"contentcreatorintegration/contentcreatorintegration.toml",
 	"contentcreatorintegration/contentcreatorintegration-common.toml",
 	"contentcreatorintegration/default/constants.json",
-	"storagedrawers-client.toml"
+	"storagedrawers-client.toml",
+	"blue_skies-client.toml"
 )
 
 $FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data", "local/ftbultimine")

diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -1,3 +1,20 @@
+### 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))
+
 ### Enigmatica 6 v0.5.7
 
 _Using Forge-1.16.5-36.2.1_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.7.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.7.md)_
@@ -39,38 +56,38 @@ _Using Forge-1.16.5-36.2.1_ | _[Mod Updates](https://github.com/NillerMedDild/En
 
 **Fixed Bugs**
 
-- 0.5.6 has bleedthrough recipes from Expert through GD Launcher [\#2740](https://github.com/NillerMedDild/Enigmatica6/issues/2740)
-- Archwood Button not oredicted [\#2735](https://github.com/NillerMedDild/Enigmatica6/issues/2735)
-- \#!/bin/sh^M [\#2755](https://github.com/NillerMedDild/Enigmatica6/issues/2755)
-- Bug pedestal import rf screen [\#2732](https://github.com/NillerMedDild/Enigmatica6/issues/2732)
-- Calculator Mod Crash when viewing JEI item recipe [\#2806](https://github.com/NillerMedDild/Enigmatica6/issues/2806)
-- Cardboard Box Can Dupe Constellation Papers [\#2718](https://github.com/NillerMedDild/Enigmatica6/issues/2718)
-- Crash when attempting to break Immersive Engineering Feedthrough Insulators [\#2825](https://github.com/NillerMedDild/Enigmatica6/issues/2825)
-- Crash when creating/generating rftool dimension [\#2817](https://github.com/NillerMedDild/Enigmatica6/issues/2817)
-- Create crafter recipe incompatible [\#2794](https://github.com/NillerMedDild/Enigmatica6/issues/2794)
-- Death waypoints not removing when deleted. [\#2769](https://github.com/NillerMedDild/Enigmatica6/issues/2769)
-- Emandatus enigmatica blocks cannot be used for RFTools dimlet creation [\#2730](https://github.com/NillerMedDild/Enigmatica6/issues/2730)
-- ERP missing from 0.5.6 release [\#2733](https://github.com/NillerMedDild/Enigmatica6/issues/2733)
-- Fermented Raw Ore Meat recipes crash [\#2771](https://github.com/NillerMedDild/Enigmatica6/issues/2771)
-- FTB-Chunks map wont load 11x11 square of chunks upon spawn in. [\#2738](https://github.com/NillerMedDild/Enigmatica6/issues/2738)
-- Gear Cast not showing up in JEI on servers [\#2503](https://github.com/NillerMedDild/Enigmatica6/issues/2503)
-- Geodes give wrong nuggets [\#2773](https://github.com/NillerMedDild/Enigmatica6/issues/2773)
-- JEI Addon: Range Tier 12 [\#2823](https://github.com/NillerMedDild/Enigmatica6/issues/2823)
-- Limestone chest with wrong tags [\#2725](https://github.com/NillerMedDild/Enigmatica6/issues/2725)
-- Nether Wart output mismatch/duplication [\#2772](https://github.com/NillerMedDild/Enigmatica6/issues/2772)
-- Occultism Questline - Soul Gem [\#2734](https://github.com/NillerMedDild/Enigmatica6/issues/2734)
-- Only vanilla crafting table can be used for craft Crafting Station / Crafting table from More Crafting Tables Mod can't be converted to vanilla one [\#2763](https://github.com/NillerMedDild/Enigmatica6/issues/2763)
-- Pedestal with filter deleting items [\#2593](https://github.com/NillerMedDild/Enigmatica6/issues/2593)
-- Remove Flywheel mod until we can update to create v0.3.2+ [\#2721](https://github.com/NillerMedDild/Enigmatica6/issues/2721)
-- RFTools Builder Quarry - Lootr Compatibility Fix [\#2811](https://github.com/NillerMedDild/Enigmatica6/issues/2811)
-- RFTools Environmental Controller No Teleport Module not preventing enderman from teleporting [\#2814](https://github.com/NillerMedDild/Enigmatica6/issues/2814)
-- serverstarter.jar forge-NONE-NONE failures [\#2801](https://github.com/NillerMedDild/Enigmatica6/issues/2801)
-- Shrink broken in latest pack update [\#2804](https://github.com/NillerMedDild/Enigmatica6/issues/2804)
-- Some Wood Types Cannot be Used in Certain Crafting Recipes [\#2762](https://github.com/NillerMedDild/Enigmatica6/issues/2762)
-- Sushi Go crafting prawns and tuna spawning on bedrock [\#2242](https://github.com/NillerMedDild/Enigmatica6/issues/2242)
-- Taking damage from Personal Shrinking Device \(from Shrink. mod\) [\#2743](https://github.com/NillerMedDild/Enigmatica6/issues/2743)
-- Upgrade Aquatic's Thrasher spawns too frequently [\#2795](https://github.com/NillerMedDild/Enigmatica6/issues/2795)
-- Wither builder no longer building anything after upgrading to 5.6 [\#2786](https://github.com/NillerMedDild/Enigmatica6/issues/2786)
+-   0.5.6 has bleedthrough recipes from Expert through GD Launcher [\#2740](https://github.com/NillerMedDild/Enigmatica6/issues/2740)
+-   Archwood Button not oredicted [\#2735](https://github.com/NillerMedDild/Enigmatica6/issues/2735)
+-   \#!/bin/sh^M [\#2755](https://github.com/NillerMedDild/Enigmatica6/issues/2755)
+-   Bug pedestal import rf screen [\#2732](https://github.com/NillerMedDild/Enigmatica6/issues/2732)
+-   Calculator Mod Crash when viewing JEI item recipe [\#2806](https://github.com/NillerMedDild/Enigmatica6/issues/2806)
+-   Cardboard Box Can Dupe Constellation Papers [\#2718](https://github.com/NillerMedDild/Enigmatica6/issues/2718)
+-   Crash when attempting to break Immersive Engineering Feedthrough Insulators [\#2825](https://github.com/NillerMedDild/Enigmatica6/issues/2825)
+-   Crash when creating/generating rftool dimension [\#2817](https://github.com/NillerMedDild/Enigmatica6/issues/2817)
+-   Create crafter recipe incompatible [\#2794](https://github.com/NillerMedDild/Enigmatica6/issues/2794)
+-   Death waypoints not removing when deleted. [\#2769](https://github.com/NillerMedDild/Enigmatica6/issues/2769)
+-   Emandatus enigmatica blocks cannot be used for RFTools dimlet creation [\#2730](https://github.com/NillerMedDild/Enigmatica6/issues/2730)
+-   ERP missing from 0.5.6 release [\#2733](https://github.com/NillerMedDild/Enigmatica6/issues/2733)
+-   Fermented Raw Ore Meat recipes crash [\#2771](https://github.com/NillerMedDild/Enigmatica6/issues/2771)
+-   FTB-Chunks map wont load 11x11 square of chunks upon spawn in. [\#2738](https://github.com/NillerMedDild/Enigmatica6/issues/2738)
+-   Gear Cast not showing up in JEI on servers [\#2503](https://github.com/NillerMedDild/Enigmatica6/issues/2503)
+-   Geodes give wrong nuggets [\#2773](https://github.com/NillerMedDild/Enigmatica6/issues/2773)
+-   JEI Addon: Range Tier 12 [\#2823](https://github.com/NillerMedDild/Enigmatica6/issues/2823)
+-   Limestone chest with wrong tags [\#2725](https://github.com/NillerMedDild/Enigmatica6/issues/2725)
+-   Nether Wart output mismatch/duplication [\#2772](https://github.com/NillerMedDild/Enigmatica6/issues/2772)
+-   Occultism Questline - Soul Gem [\#2734](https://github.com/NillerMedDild/Enigmatica6/issues/2734)
+-   Only vanilla crafting table can be used for craft Crafting Station / Crafting table from More Crafting Tables Mod can't be converted to vanilla one [\#2763](https://github.com/NillerMedDild/Enigmatica6/issues/2763)
+-   Pedestal with filter deleting items [\#2593](https://github.com/NillerMedDild/Enigmatica6/issues/2593)
+-   Remove Flywheel mod until we can update to create v0.3.2+ [\#2721](https://github.com/NillerMedDild/Enigmatica6/issues/2721)
+-   RFTools Builder Quarry - Lootr Compatibility Fix [\#2811](https://github.com/NillerMedDild/Enigmatica6/issues/2811)
+-   RFTools Environmental Controller No Teleport Module not preventing enderman from teleporting [\#2814](https://github.com/NillerMedDild/Enigmatica6/issues/2814)
+-   serverstarter.jar forge-NONE-NONE failures [\#2801](https://github.com/NillerMedDild/Enigmatica6/issues/2801)
+-   Shrink broken in latest pack update [\#2804](https://github.com/NillerMedDild/Enigmatica6/issues/2804)
+-   Some Wood Types Cannot be Used in Certain Crafting Recipes [\#2762](https://github.com/NillerMedDild/Enigmatica6/issues/2762)
+-   Sushi Go crafting prawns and tuna spawning on bedrock [\#2242](https://github.com/NillerMedDild/Enigmatica6/issues/2242)
+-   Taking damage from Personal Shrinking Device \(from Shrink. mod\) [\#2743](https://github.com/NillerMedDild/Enigmatica6/issues/2743)
+-   Upgrade Aquatic's Thrasher spawns too frequently [\#2795](https://github.com/NillerMedDild/Enigmatica6/issues/2795)
+-   Wither builder no longer building anything after upgrading to 5.6 [\#2786](https://github.com/NillerMedDild/Enigmatica6/issues/2786)
 
 ### Enigmatica 6 v0.5.6