Merge pull request #3414 from NillerMedDild/develop

0.5.15
EnigmaticaModpacks · Oct 11, 2021 · 7c12d36 · 7c12d36
2 parents ccfcee4 + 9fae0d4
commit 7c12d36
Show file tree

Hide file tree

Showing 136 changed files with 24,770 additions and 20,872 deletions.
diff --git a/.gitignore b/.gitignore
@@ -193,3 +193,5 @@ config/equipmentcompare-common.toml
 config/roadrunner/common.toml
 config/roadrunner/client.toml
 config/oauth-client.toml
+config/jeed-client.toml
+config/valhelsia_core-client.toml
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.14"
+$MODPACK_VERSION = "0.5.15"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.13"
+$LAST_MODPACK_VERSION = "0.5.14"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS
@@ -157,7 +157,9 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
 	"equipmentcompare-common.toml",
 	"roadrunner/client.toml",
 	"roadrunner/common.toml",
-	"oauth-client.toml"
+	"oauth-client.toml",
+	"jeed-client.toml",
+	"valhelsia_core-client.toml"
 )
 
 $FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data", "local/ftbultimine", "config/configswapper/Launch Backup")

diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -1,29 +1,36 @@
-### Enigmatica 6 v0.5.14
+### Enigmatica 6 v0.5.15
 
-_Using Forge-1.16.5-36.2.4_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.14.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.14.md)_
+_Using Forge-1.16.5-36.2.4_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.15.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.15.md)_
+
+**Bug Fixes**
+
+-   Quests: Fixed Infinity Tools quest not triggering
+-   Occultism: Fixed Summoning familiars not triggering the advancement
+
+**Changes/Improvements**
 
+-   Adjusted our Experience Fluid exchanging recipes. The cycle now goes IF -> PNC -> Thermal -> IF
 
+### Enigmatica 6 v0.5.14
+
+_Using Forge-1.16.5-36.2.4_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.14.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.14.md)_
 
 **Info**
 
 Placed Chisel & Bits will most likely change when updating.
 We've updated to a new major version of the mod which hopefully makes sure this doesn't happen again.
 
-
-
 **Bug Fixes**
 
-- Some ponder entries missing their text [\#3318](https://github.com/NillerMedDild/Enigmatica6/issues/3318)
-- \[0.5.12\] Create Cogwheels placing [\#3317](https://github.com/NillerMedDild/Enigmatica6/issues/3317)
-- \[0.5.12\] Wrenches and Block Rotation [\#3310](https://github.com/NillerMedDild/Enigmatica6/issues/3310)
+-   Some ponder entries missing their text [\#3318](https://github.com/NillerMedDild/Enigmatica6/issues/3318)
+-   \[0.5.12\] Create Cogwheels placing [\#3317](https://github.com/NillerMedDild/Enigmatica6/issues/3317)
+-   \[0.5.12\] Wrenches and Block Rotation [\#3310](https://github.com/NillerMedDild/Enigmatica6/issues/3310)
 
 **Changes/Improvements**
 
-- PVJ Tree Compat [\#3319](https://github.com/NillerMedDild/Enigmatica6/pull/3319) ([MuteTiefling](https://github.com/MuteTiefling))
-- Added PVJ Trees to Market
-- Added some PVJ biomes to worldgen
-
-
+-   PVJ Tree Compat [\#3319](https://github.com/NillerMedDild/Enigmatica6/pull/3319) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Added PVJ Trees to Market
+-   Added some PVJ biomes to worldgen
 
 ---
 

diff --git a/config/advancedperipherals-common.toml b/config/advancedperipherals-common.toml
@@ -131,7 +131,7 @@
 
 [world]
 	#Enable the villager structures for the computer scientist.
-	enableVillagerStructures = true
+	enableVillagerStructures = false
 	#Gives the ap documentation to new players on a world.
 	givePlayerBookOnJoin = false
 

diff --git a/config/alexsmobs/komodo_dragon_spawns.json b/config/alexsmobs/komodo_dragon_spawns.json
@@ -1,16 +1,40 @@
 {
-  "biomes": [
-    [
-      {
-        "type": "BIOME_DICT",
-        "negate": false,
-        "value": "overworld"
-      },
-      {
-        "type": "BIOME_DICT",
-        "negate": false,
-        "value": "mesa"
-      }
+    "biomes": [
+        [
+            {
+                "type": "BIOME_DICT",
+                "negate": false,
+                "value": "overworld"
+            },
+            {
+                "type": "BIOME_DICT",
+                "negate": false,
+                "value": "mesa"
+            }
+        ],
+        [
+            {
+                "type": "BIOME_DICT",
+                "negate": false,
+                "value": "overworld"
+            },
+            {
+                "type": "BIOME_DICT",
+                "negate": false,
+                "value": "savanna"
+            }
+        ],
+        [
+            {
+                "type": "BIOME_DICT",
+                "negate": false,
+                "value": "overworld"
+            },
+            {
+                "type": "BIOME_CATEGORY",
+                "negate": false,
+                "value": "desert"
+            }
+        ]
     ]
-  ]
-}
+}