Merge pull request #4366 from EnigmaticaModpacks/develop

0.5.27

.gitignore

@@ -219,3 +219,5 @@ config/industrialforegoing/machine-agriculture-husbandry.toml
 manifest.json
 config/modularrouters-common.toml
 config/Mekanism/generators.toml
+server_files_expert/server-guide.txt
+config/bhmenu-client.toml

automation/modpack-uploader-expert.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\modpack-uploader.ps1" -uploadExpertMode

automation/modpack-uploader.ps1

@@ -1,3 +1,8 @@
+param(
+    [Parameter(Position = 0)]
+    [switch]$uploadExpertMode
+)
+
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
 $manifest = "manifest.json"
@@ -16,6 +21,24 @@ function Validate-SecretsFile {
 . "$PSScriptRoot\settings.ps1"
 . "$PSScriptRoot\$secretsFile"
 
+if ($uploadExpertMode) {
+    $CURSEFORGE_PROJECT_ID = 585046
+    $SERVER_FILES_FOLDER = "$INSTANCE_ROOT/server_files_expert"
+    $SERVER_SETUP_CONFIG_PATH = "$SERVER_FILES_FOLDER/server-setup-config.yaml"
+    $MODPACK_NAME = "Enigmatica6Expert"
+    $CLIENT_NAME = "Enigmatica6Expert"
+    $CLIENT_FILE_DISPLAY_NAME = "Enigmatica 6 Expert $MODPACK_VERSION"
+    $SERVER_FILE_DISPLAY_NAME = "Enigmatica 6 Expert Server $MODPACK_VERSION"
+    $modeFilePath = "mode.json"
+    $FOLDERS_TO_INCLUDE_IN_CLIENT_FILES += $modeFilePath
+
+    # Force the mode.json to be in expert mode for publishing
+    $modeFile = Get-Content -Raw -Path $modeFilePath | ConvertFrom-Json
+    if ($modeFile.mode -ne "expert") {
+        $modeFile.mode = "expert"
+        $modeFile | ConvertTo-Json | Set-Content $modeFilePath
+    }
+}
 
 function Get-GitHubRelease {
     param(
@@ -356,7 +379,9 @@ function New-GitHubRelease {
         Write-Host 
 
         Invoke-RestMethod -Headers $Headers -Uri $Uri -Body $Body -Method Post
-        Start-Process Powershell.exe -Argument "-NoProfile -Command github_changelog_generator --since-tag $CHANGES_SINCE_VERSION"
+
+        # github_changelog_generator does not seem to run when I do this? Running it manually for now
+        #Start-Process Powershell.exe -Argument "-NoProfile -Command github_changelog_generator --since-tag $CHANGES_SINCE_VERSION"
     }
 }
 

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "0.5.26"
+$MODPACK_VERSION = "0.5.27"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.25"
+$LAST_MODPACK_VERSION = "0.5.26"
 
 # =====================================================================//
 #  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
@@ -177,7 +177,7 @@ $FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/
 
 $SERVER_FILES_FOLDER = "$INSTANCE_ROOT/server_files"
 
-$SERVER_SETUP_CONFIG_PATH = "$INSTANCE_ROOT/server_files/server-setup-config.yaml"
+$SERVER_SETUP_CONFIG_PATH = "$SERVER_FILES_FOLDER/server-setup-config.yaml"
 
 # A continuous line of the folders and files (with extensions) to zip into Server Files.
 # Default: @("mods", "config")

automation/start-automated-server.sh

@@ -23,9 +23,9 @@
 ####
 
 if test -f $PWD/remove-client-mods.ps1; then
-	powershell $PWD/remove-client-mods.ps1 >/dev/null
+	pwsh $PWD/remove-client-mods.ps1 >/dev/null
 elif test -f remove-client-mods.ps1; then
-	powershell remove-client-mods.ps1 >/dev/null
+	pwsh remove-client-mods.ps1 >/dev/null
 fi
 
 unameOut="$(uname -s)"

automation/update-and-start-server.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-powershell $PWD/update-server.ps1
+pwsh $PWD/update-server.ps1
 bash $PWD/../start-automated-server.sh

automation/update-server.ps1

@@ -31,8 +31,7 @@ function Determine-Location {
 		if (-not (Test-Path $modFolder)) {
 			Write-Host "Unable to determine where the main folder is. " -ForegroundColor Red
 			Write-Host "This script should be run from the instance root, or from the automation folder." -ForegroundColor Red
-			pause
-			throw
+			throw "Unable to determine where the main folder is. This script should be run from the instance root, or from the automation folder."
 		}
 	}
 }

building_gadgets_patterns/pneumaticcraft/electrostatic_compressor.json

@@ -0,0 +1,36 @@
+{
+    "header": {
+        "version": "2.1.0",
+        "mc_version": "1.16.5",
+        "name": "Electrostatic Compressor",
+        "author": "Enigmatica",
+        "bounding_box": {
+            "min_x": 0,
+            "min_y": 0,
+            "min_z": 0,
+            "max_x": 10,
+            "max_y": 20,
+            "max_z": 10
+        },
+        "material_list": {
+            "root_type": "buildinggadgets:entries",
+            "root_entry": [
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 1,
+                    "item": {
+                        "id": "pneumaticcraft:electrostatic_compressor"
+                    }
+                },
+                {
+                    "item_type": "buildinggadgets:simple_item",
+                    "count": 236,
+                    "item": {
+                        "id": "minecraft:iron_bars"
+                    }
+                }
+            ]
+        }
+    },
+    "body": "H4sIAAAAAAAAAM2WzY7bNhRGOeK9JK8m/cnPA2TXdbbZdp2giy7SbAYam+MIsC1DkpGk79x3CCkdp0UWQYNimgEMH1ISr8/9LIFqnTMn227uWufcdbuOnXftlMe+2/d/5rGccK3Tae7m3Lr2t3E45XHu85Sc5G6anczjOSd3/b5cMO6H3S5vnd51+6kc1Gk4z+8ul+hxGMvsclLe57J8nbkyfd0dsnt66I95M3Z388t+HI43t904VYHvYLacuxexy+88PLNvjozZw/a6x3vs2//K/ymxfyP2eXp/D+Zl+S+nYz4furnfrDXyPm/mcajX9JubzXA4jXmahvEeb5Avun1Id8jX1L7rQ/Vfxcz50zBJMfmr6jSpfl85DwUqDDAubFxaWEbGOihQYYDRWGfruqtUDpZUGuihQIUBRpgWNs4WljpGHeihQIUBRpiMOrbWKWk19fgVbKCHAhUGGGGCtrBx7UJXc17rwgZ6KFBhgBEmaEbdhVJ9Pb4eX4+vx9fj6/H1+Hp8Pb6FWn39UteoCxvooUCFAUaYoBl1jbqpfi2+gq/gK/gKvoKv4Cv4Cr6Cr+Ar+Aq+gq/gK/gKvoKv4Cv4Cr6FoYzqp/AKNtBDgQoDjJVLv0q/Sr9Kv0q/Sr9Kv0q/Sr9Kv0q/Sr9Kv0q/Sr9Kv0q/Sr9Kv0q/Sr9Kv4VFusX/Gj6CP8Af4U/wZ/gYPoFP4bPPOQRyCOQQyCGQQyCHQA6BHAI5BHII5BDIIZBDIIdADoEcAjkEcgjkEMghkEMgh4BvxDfiG/GN+EZ8I74R34hvxDfiG/GN+EZ8I74R34hvxDfiG/GN+EZ8Y5Utn4Rvwjfhm/BN+CZ8E74J34RvqpJtWouWYcI34ZvwTfgmfBO+Cd+Eb8J3rWtr3eJpeBqehqfhaXganoan1Tq2MFUvw8vwMrwML8PL8DK81jq21ikebd2MPRSoMMC40KpHu6wz1kGBCgOMxrrCcvRd7rZ5LPdwV/bw8k716NV5zr/3+W7fH3fl/O1wPm6n0kbZs/+o28c6fHMZdh/e1neHdVgveLYO31yO9se3bGdyrJt//HU4fXz+4kX9C/5+AUnLnvz89tzvt+WHd912l+fp5fZ8OHy8+cd7yicluiKuhw4AAA\u003d\u003d"
+}

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", "waystones", "powah", "pneumaticcraft"]
+	cardboardModBlacklist = ["refinedstorage", "tetra", "storagedrawers", "lootr", "extrastorage", "astralsorcery", "waystones", "powah", "pneumaticcraft", "bloodmagic", "occultism", "eidolon"]
 	#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/apotheosis/spawner.cfg

@@ -185,7 +185,11 @@ spawn_eggs {
         ars_nouveau:familiar_drygmy,
         ars_nouveau:familiar_jabberwog,
         ars_nouveau:familiar_sylph,
-        ars_nouveau:familiar_wixie
+        ars_nouveau:familiar_wixie,
+        undergarden:masticator,
+        meetyourfight:swampjaw,
+        meetyourfight:bellringer,
+        meetyourfight:dame_fortuna
      >
 }
 

config/bloodmagic-common.toml

@@ -2,7 +2,7 @@
 #Stops the listed entities from being used in the Well of Suffering.
 #Use the registry name of the entity. Vanilla entities do not require the modid.
 [Blacklist]
-	wellOfSuffering = ["dummmmmmy:target_dummy", "ars_nouveau:whelp", "ars_nouveau:familiar_bookwyrm", "ars_nouveau:carbuncle", "ars_nouveau:familiar_carbuncle", "ars_nouveau:drygmy", "ars_nouveau:familiar_drygmy", "ars_nouveau:dummy", "ars_nouveau:familiar_jabberwog", "ars_nouveau:sylph", "ars_nouveau:familiar_sylphy", "ars_nouveau:wixie", "ars_nouveau:familiar_wixie", "ars_nouveau:summon_horse", "ars_nouveau:summon_wolf", "ars_nouveau:ally_vex"]
+	wellOfSuffering = ["dummmmmmy:target_dummy", "ars_nouveau:whelp", "ars_nouveau:familiar_bookwyrm", "ars_nouveau:carbuncle", "ars_nouveau:familiar_carbuncle", "ars_nouveau:drygmy", "ars_nouveau:familiar_drygmy", "ars_nouveau:dummy", "ars_nouveau:familiar_jabberwog", "ars_nouveau:sylph", "ars_nouveau:familiar_sylph", "ars_nouveau:wixie", "ars_nouveau:familiar_wixie", "ars_nouveau:summon_horse", "ars_nouveau:summon_wolf", "ars_nouveau:ally_vex"]
 
 #Amount of LP the Sacrificial Dagger should provide for each damage dealt.
 ["Config Values"]
@@ -12,7 +12,7 @@
 	#Setting the value to 0 will blacklist it.
 	#Use the registry name of the entity followed by a ';' and then the value you want.
 	#Vanilla entities do not require the modid.
-	sacrificialValues = ["villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100", "parrot;300", "dummmmmmy:target_dummy;0", "ars_nouveau:whelp;0", "ars_nouveau:familiar_bookwyrm;0", "ars_nouveau:carbuncle;0", "ars_nouveau:familiar_carbuncle;0", "ars_nouveau:drygmy;0", "ars_nouveau:familiar_drygmy;0", "ars_nouveau:dummy;0", "ars_nouveau:familiar_jabberwog;0", "ars_nouveau:sylph;0", "ars_nouveau:familiar_sylphy;0", "ars_nouveau:wixie;0", "ars_nouveau:familiar_wixie;0", "ars_nouveau:summon_horse;0", "ars_nouveau:summon_wolf;0", "ars_nouveau:ally_vex"]
+	sacrificialValues = ["villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100", "parrot;300", "dummmmmmy:target_dummy;0", "ars_nouveau:whelp;0", "ars_nouveau:familiar_bookwyrm;0", "ars_nouveau:carbuncle;0", "ars_nouveau:familiar_carbuncle;0", "ars_nouveau:drygmy;0", "ars_nouveau:familiar_drygmy;0", "ars_nouveau:dummy;0", "ars_nouveau:familiar_jabberwog;0", "ars_nouveau:sylph;0", "ars_nouveau:familiar_sylph;0", "ars_nouveau:wixie;0", "ars_nouveau:familiar_wixie;0", "ars_nouveau:summon_horse;0", "ars_nouveau:summon_wolf;0", "ars_nouveau:ally_vex"]
 	#State that the dungeon spawning ritual can only be activated when using a Creative Activation Crystal.
 	#Used on servers for if you do not trust your players to not destroy other people's bases.
 	makeDungeonRitualCreativeOnly = false

config/configswapper/expert/config/bhmenu-client.toml

@@ -0,0 +1,12 @@
+#The title to display at the top of the entry.
+title = "Need a server?"
+#The description to display below the title.
+description = "Click me to get your own server!"
+#Your affiliate ID to use in during the ordering process.
+#Without this you will not be credited for the purchases.
+#(Your affiliate id is not the same as your referral link, please check your client area to find your affiliate id at https://www.bisecthosting.com/partners/console.php).
+affiliate_id = "2214"
+#The id of this modpack.
+#(This is BH internal pack id; Find the id here: https://www.bisecthosting.com/partners/console.php)
+pack_id = "16819"
+

config/configswapper/expert/config/packmenu.cfg

@@ -0,0 +1,132 @@
+# Configuration file
+
+"forge info" {
+    # The anchor point for this element. [default: FORGE]
+    S:"Anchor Point"=FORGE
+
+    # The X offset for this element. [range: -1000 ~ 1000, default: 0]
+    I:"X Offset"=0
+
+    # The Y Offset for this element. [range: -1000 ~ 1000, default: 0]
+    I:"Y Offset"=0
+}
+
+
+general {
+    # If forge information is drawn at the top center.  This includes beta and update warnings. [default: true]
+    B:"Draw Forge Info"=false
+
+    # If the "Java Edition" text is drawn. [default: true]
+    B:"Draw Java Edition"=false
+
+    # If the vanilla panorama, and it's fade-in, are rendered.  Enabling this disables the use of the custom background options. [default: false]
+    B:"Draw Panorama"=true
+
+    # If the splash text is drawn. [default: true]
+    B:"Draw Splash"=false
+
+    # If the title (the giant minecraft text) is drawn. [default: true]
+    B:"Draw Title"=false
+
+    # If the resource pack is loaded from /resources instead of /resources.zip [default: true]
+    B:"Folder Pack"=true
+
+    # If the Panorama has a fade-in effect. [default: false]
+    B:"Panorama Fade In"=false
+
+    # A multiplier on panorama speed. [range: 0.01 ~ 100.0, default: 1.0]
+    S:"Panorama Speed"=0.5
+
+    # The number of variations of panorama that exist.  Panorama files other than the original set must have the form panorama<y>_<z>.png.  For example the first file of varation #2 would be panorama1_0.png [range: 1 ~ 10, default: 1]
+    I:"Panorama Variations"=1
+}
+
+
+"java edition text" {
+    # The anchor point for this element. [default: JAVAED]
+    S:"Anchor Point"=JAVAED
+
+    # The X offset for this element. [range: -1000 ~ 1000, default: 0]
+    I:"X Offset"=0
+
+    # The Y Offset for this element. [range: -1000 ~ 1000, default: 0]
+    I:"Y Offset"=0
+}
+
+
+logo {
+    # The anchor point of the logo.  The types of anchor points are available on the wiki. [default: DEFAULT_LOGO]
+    S:"Anchor Point"=TOP_CENTER
+
+    # The height of the logo. [range: 0 ~ 500000, default: 100]
+    I:Height=145
+
+    # The height of the logo's texture. [range: 0 ~ 500000, default: 300]
+    I:"Texture Height"=145
+
+    # The location of the logo texture.  Must be a png file.  Should contain the extension. [default: packmenu:textures/gui/logo.png]
+    S:"Texture Path"=enigmatica:textures/logo_expert.png
+
+    # The width of the logo's texture. [range: 0 ~ 500000, default: 300]
+    I:"Texture Width"=350
+
+    # The width of the logo. [range: 0 ~ 500000, default: 100]
+    I:Width=350
+
+    # The X offset of the logo. [range: -500000 ~ 500000, default: -650]
+    I:"X Offset"=-175
+
+    # The Y offset of the logo. [range: -500000 ~ 500000, default: 0]
+    I:"Y Offset"=5
+}
+
+
+slideshow {
+    # How long between slideshow transitions. [range: 1 ~ 1000000, default: 200]
+    I:Duration=200
+
+    # The list of textures to be displayed on the slideshow.  If empty, the slideshow is ignored. [default: ]
+    S:Textures <
+     >
+
+    # How long the slideshow transition lasts. [range: 1 ~ 1000000, default: 20]
+    I:"Transition Duration"=20
+}
+
+
+"splash text" {
+    # The anchor point for this element. [default: SPLASH]
+    S:"Anchor Point"=SPLASH
+
+    # The color of the splash text. [range: -2147483647 ~ 2147483647, default: -256]
+    I:Color=-256
+
+    # The rotation value of the splash text. [range: -360.0 ~ 360.0, default: -20.0]
+    S:Rotation=-20.0
+
+    # The X offset for this element. [range: -1000 ~ 1000, default: 0]
+    I:"X Offset"=0
+
+    # The Y Offset for this element. [range: -1000 ~ 1000, default: 0]
+    I:"Y Offset"=0
+}
+
+
+support {
+    # The URL that the link on the supporters page goes to. [default: https://www.patreon.com/Shadows_of_Fire?fan_landing=true]
+    S:"Patreon Url"=https://www.patreon.com/Shadows_of_Fire?fan_landing=true
+}
+
+
+title {
+    # The anchor point for this element. [default: TITLE]
+    S:"Anchor Point"=TITLE
+
+    # The X offset for this element. [range: -1000 ~ 1000, default: 0]
+    I:"X Offset"=0
+
+    # The Y Offset for this element. [range: -1000 ~ 1000, default: 0]
+    I:"Y Offset"=0
+}
+
+

config/configswapper/normal/config/bhmenu-client.toml

@@ -0,0 +1,12 @@
+#The title to display at the top of the entry.
+title = "Need a server?"
+#The description to display below the title.
+description = "Click me to get your own server!"
+#Your affiliate ID to use in during the ordering process.
+#Without this you will not be credited for the purchases.
+#(Your affiliate id is not the same as your referral link, please check your client area to find your affiliate id at https://www.bisecthosting.com/partners/console.php).
+affiliate_id = "2214"
+#The id of this modpack.
+#(This is BH internal pack id; Find the id here: https://www.bisecthosting.com/partners/console.php)
+pack_id = "16819"
+