Merge pull request #2079 from NillerMedDild/develop

0.4.10

.github/move.yml

@@ -28,6 +28,7 @@ aliases:
    e4: enigmatica4
    e5: enigmatica5
    e6: enigmatica6
+   e6e: enigmatica6expert
    s: scientia
 
 # Repository to extend settings from

.gitignore

@@ -157,3 +157,5 @@ config.json
 .DS_Store
 .DS_Store?
 
+config/rftoolsdim-client.toml
+config/clienttweaks-client.toml

automation/.build.json

@@ -2,6 +2,6 @@
     "packAuthor": "NillerMedDild",
     "minecraftVersion": "1.16.5",
     "modLoader": "forge",
-    "modLoaderVersion": "36.1.4",
+    "modLoaderVersion": "36.1.13",
     "includes": ["config", "defaultconfigs", "kubejs", "packmenu", "patchouli_books"]
 }

automation/remove-client-mods.ps1

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

automation/settings.cfg

@@ -14,5 +14,5 @@ HIGH_CPU_PRIORITY=0;
 
 MODPACK_NAME=Enigmatica 6;
 MCVER=1.16.5;
-FORGEVER=36.1.2;
-FORGEURL=https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.16.5-36.1.2/forge-1.16.5-36.1.2-installer.jar;
+FORGEVER=36.1.13;
+FORGEURL=https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.16.5-36.1.13/forge-1.16.5-36.1.13-installer.jar;

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "0.4.9"
+$MODPACK_VERSION = "0.4.10"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.4.8"
+$LAST_MODPACK_VERSION = "0.4.9"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS
@@ -212,7 +212,7 @@ $CLIENT_ZIP_NAME = "$CLIENT_NAME-$MODPACK_VERSION"
 $LAST_MODPACK_ZIP_NAME = "$CLIENT_NAME-$LAST_MODPACK_VERSION"
 
 # Default: "$CLIENT_NAME $MODPACK_VERSION"
-$CLIENT_FILE_DISPLAY_NAME = "$CLIENT_NAME $MODPACK_VERSION"
+$CLIENT_FILE_DISPLAY_NAME = "Enigmatica 6 $MODPACK_VERSION"
 
 # Can be "markdown", "text" or "html"
 # Default: $CLIENT_CHANGELOG_TYPE
@@ -230,7 +230,7 @@ $SERVER_RELEASE_TYPE = $CLIENT_RELEASE_TYPE
 $SERVER_ZIP_NAME = "$CLIENT_NAME`Server-$MODPACK_VERSION"
 
 # Default: $SERVER_FILENAME
-$SERVER_FILE_DISPLAY_NAME = "$CLIENT_NAME Server $MODPACK_VERSION"
+$SERVER_FILE_DISPLAY_NAME = "Enigmatica 6 Server $MODPACK_VERSION"
 
 # Path to the ModListCreators output file
 $ModlistPath = "$InstanceRoot/changelogs/modlist_$MODPACK_VERSION.md"

automation/start-automated-server.bat

@@ -708,9 +708,9 @@ IF NOT EXIST "%~dp0server.properties" (
 	ECHO INFO: server.properties not found... populating default 1>>  "%~dp0logs\serverstart.log" 2>&1
 	ECHO view-distance=8 1>> "%~dp0server.properties"  2> "%~dp0logs\serverstart.log"
 	ECHO allow-flight=true 1>> "%~dp0server.properties"  2> "%~dp0logs\serverstart.log"
-	ECHO level-type=BIOMESOP 1>> "%~dp0server.properties"  2> "%~dp0logs\serverstart.log"
+	ECHO level-type=terraforged 1>> "%~dp0server.properties"  2> "%~dp0logs\serverstart.log"
 	ECHO snooper-enabled=false 1>> "%~dp0server.properties"  2> "%~dp0logs\serverstart.log"
-	ECHO max-tick-time=90000 1>> "%~dp0server.properties"  2> "%~dp0logs\serverstart.log"
+	ECHO max-tick-time=300000 1>> "%~dp0server.properties"  2> "%~dp0logs\serverstart.log"
 	ECHO motd=%MC_SERVER_PACKNAME% 1>> "%~dp0server.properties"  2> "%~dp0logs\serverstart.log"
 	)
 IF NOT EXIST "%~dp0eula.txt" (

automation/update-server.ps1

@@ -92,7 +92,7 @@ function Pull-Changes {
 	Write-Host "Pulling changes from Git..." -ForegroundColor Cyan
 	git stash
 	git reset --hard
-	git pull
+	git pull origin $targetBranch
 }
 
 function Move-ServerFiles {

config/advancedperipherals-common.toml

@@ -2,10 +2,10 @@
 #No comment
 [Restrictions]
 	#Defines the chat box cooldown for message sending.
-	#Range: 1 ~ 100000
+	#Range: > 1
 	chatBoxCooldown = 10
 	#The max range of the player detector functions. If anyone use a higher range, the detector will use this max range
-	#Range: 0 ~ 2147483646
+	#Range: > 0
 	playerDetMaxRange = 2147483646
 	#Defines the maximum energy flow of the energy detector.
 	#Range: > 1
@@ -33,4 +33,6 @@
 	enableARGoggles = true
 	#Enable the inventory manager or not.
 	enableInventoryManager = true
+	#Enable the redstone integrator or not.
+	enableRedstoneIntegrator = true
 

config/apotheosis/enchantments.cfg

@@ -1472,7 +1472,7 @@
 
 
 "minecraft:blast_protection" {
-    # The max level of this enchantment - normally 4. [range: 1 ~ 127, default: 8]
+    # The max level of this enchantment - normally 4. [range: 1 ~ 127, default: 9]
     I:"Max Level"=7
 
     # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
@@ -1532,7 +1532,7 @@
 
 
 "minecraft:feather_falling" {
-    # The max level of this enchantment - normally 4. [range: 1 ~ 127, default: 8]
+    # The max level of this enchantment - normally 4. [range: 1 ~ 127, default: 10]
     I:"Max Level"=5
 
     # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
@@ -1562,7 +1562,7 @@
 
 
 "minecraft:fire_protection" {
-    # The max level of this enchantment - normally 4. [range: 1 ~ 127, default: 8]
+    # The max level of this enchantment - normally 4. [range: 1 ~ 127, default: 9]
     I:"Max Level"=7
 
     # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
@@ -1787,7 +1787,7 @@
 
 
 "minecraft:projectile_protection" {
-    # The max level of this enchantment - normally 4. [range: 1 ~ 127, default: 8]
+    # The max level of this enchantment - normally 4. [range: 1 ~ 127, default: 10]
     I:"Max Level"=7
 
     # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
@@ -2011,6 +2011,21 @@
 }
 
 
+"mythicbotany:hammer_mobility" {
+    # The max level of this enchantment - normally 5. [range: 1 ~ 127, default: 9]
+    I:"Max Level"=9
+
+    # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
+    S:"Max Power Function"=
+
+    # The min level of this enchantment. [range: 1 ~ 127, default: 1]
+    I:"Min Level"=1
+
+    # A function to determine the min enchanting power. [default: ]
+    S:"Min Power Function"=
+}
+
+
 "naturesaura:aura_mending" {
     # The max level of this enchantment - normally 1. [range: 1 ~ 127, default: 1]
     I:"Max Level"=1
@@ -2187,31 +2202,17 @@
 
 
 "twilightforest:chill_aura" {
-    # The max level of this enchantment - normally 1. [range: 1 ~ 127, default: 1]
     I:"Max Level"=1
-
-    # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
     S:"Max Power Function"=
-
-    # The min level of this enchantment. [range: 1 ~ 127, default: 1]
     I:"Min Level"=1
-
-    # A function to determine the min enchanting power. [default: ]
     S:"Min Power Function"=
 }
 
 
 "twilightforest:fire_react" {
-    # The max level of this enchantment - normally 1. [range: 1 ~ 127, default: 1]
     I:"Max Level"=1
-
-    # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
     S:"Max Power Function"=
-
-    # The min level of this enchantment. [range: 1 ~ 127, default: 1]
     I:"Min Level"=1
-
-    # A function to determine the min enchanting power. [default: ]
     S:"Min Power Function"=
 }
 

config/ars_nouveau-common.toml

@@ -156,8 +156,12 @@
 	summon_steed = true
 	#Summon Wolves enabled?
 	summon_wolves = true
-	#Decoy enabled?
-	decoy = true
+	#Underfoot enabled?
+	underfoot = true
+	#Summon Decoy enabled?
+	summon_decoy = true
+	#Hex enabled?
+	hex = true
 
 #Mana
 [mana]
@@ -371,9 +375,15 @@
 	#Summon Wolves cost
 	#Range: > -2147483648
 	summon_wolves_cost = 0
-	#Decoy cost
+	#Underfoot cost
 	#Range: > -2147483648
-	decoy_cost = 50
+	underfoot_cost = 5
+	#Summon Decoy cost
+	#Range: > -2147483648
+	summon_decoy_cost = 200
+	#Hex cost
+	#Range: > -2147483648
+	hex_cost = 100
 
 #Starting Spells
 ["Starter Spells"]

config/cofh_core-client.toml

@@ -3,7 +3,7 @@
 	#If TRUE, Item descriptions will be added to their tooltips if possible.
 	"Show Item Descriptions" = true
 	#If TRUE, Enchantment descriptions will be added to the tooltip for Enchanted Books containing only a single enchantment.
-	"Show Enchantment Descriptions" = false
+	"Show Enchantment Descriptions" = true
 	#If TRUE and Advanced Tooltips are enabled (F3+H), Tags will be will be added to item tooltips if possible.
 	"Show Item Tags" = false
 	#If TRUE, CoFH Items will always show full details (charge state, etc.) and will not require Shift to be held down.

config/compactmachines-common.toml

@@ -2,5 +2,5 @@
 #Recipes and Integrations
 [recipes]
 	#Enable vanilla-style recipes.
-	vanillaRecipes = false
+	vanillaRecipes = true
 

config/constructionwand-client.toml

@@ -0,0 +1,16 @@
+
+#This is the Client config for ConstructionWand.
+#If you're not familiar with Forge's new split client/server config, let me explain:
+#Client config is stored in the /config folder and only contains client specific settings like graphics and keybinds.
+#Mod behavior is configured in the Server config, which is world-specific and thus located
+#in the /saves/myworld/serverconfig folder. If you want to change the serverconfig for all
+#new worlds, copy the config files in the /defaultconfigs folder.
+[keys]
+	#Key code of OPTKEY (Default: Left Control). Look up key codes under https://www.glfw.org/docs/3.3/group__keys.html
+	#Range: 0 ~ 350
+	OptKey = 341
+	#Press SNEAK+OPTKEY instead of SNEAK for changing wand mode/direction lock
+	ShiftOpt = false
+	#Press SNEAK+OPTKEY instead of SNEAK for opening wand GUI
+	ShiftOptGUI = true
+

config/defaultoptions/options.txt

@@ -1,10 +1,10 @@
-version:2584
+version:2586
 autoJump:false
 autoSuggestions:true
 chatColors:true
 chatLinks:true
 chatLinksPrompt:true
-enableVsync:true
+enableVsync:false
 entityShadows:true
 forceUnicodeFont:false
 discrete_mouse_scroll:false
@@ -22,12 +22,12 @@ mouseSensitivity:0.5
 fov:0.0
 screenEffectScale:1.0
 fovEffectScale:1.0
-gamma:0.5017605423927307
+gamma:0.0
 renderDistance:10
 entityDistanceScaling:1.0
-guiScale:0
+guiScale:2
 particles:0
-maxFps:60
+maxFps:260
 graphicsMode:1
 ao:2
 biomeBlendRadius:2
@@ -66,12 +66,12 @@ hideMatchedNames:true
 joinedFirstServer:true
 syncChunkWrites:true
 soundCategory_master:1.0
-soundCategory_music:1.0
+soundCategory_music:0.5
 soundCategory_record:1.0
-soundCategory_weather:0.5070422
+soundCategory_weather:0.5
 soundCategory_block:1.0
 soundCategory_hostile:1.0
-soundCategory_neutral:0.5023474
+soundCategory_neutral:1.0
 soundCategory_player:1.0
 soundCategory_ambient:1.0
 soundCategory_voice:1.0

config/dynview-common.toml

@@ -0,0 +1,21 @@
+
+["Dynamic Chunk View Distance Settings"]
+	#The minimum chunk view distance allowed to use. Default: 4
+	#Range: 3 ~ 200
+	minChunkViewDist = 4
+	#The maximum chunk view distance allowed to use. Set to the max a player could benefit from. Default: 20
+	#Range: 1 ~ 200
+	maxChunkViewDist = 12
+	#The average tick time to stabilize the chunk view distance around. Setting it higher than 50ms is not advised, as after 50ms the TPS will go below 20. Default: 45ms
+	#Range: 10 ~ 100
+	meanAvgTickTime = 45
+	#The update frequency of average server tick time checks to update view distances. Default: 30sec
+	#Range: 1 ~ 1000
+	viewDistanceUpdateRate = 30
+	#Whether to output log messages for actions done. This can be helpful to balance the other settings nicely.
+	logMessages = true
+
+["Chunk slow unload settings"]
+	#Enable slightly slower chunk unloading after load, helps with mods hot-loading chunks frequently. Default: true
+	chunkunload = true
+