Merge pull request #2616 from NillerMedDild/develop

0.5.4

.gitignore

@@ -5,7 +5,8 @@
 /.mixin.out/
 /logs/
 config/forgeendertech/Biomes/
-/local/
+/local/ftbchunks/data
+/local/ftbutilities
 /libraries/
 /llibrary/
 /ESM/
@@ -178,7 +179,7 @@ config/gravestone-client.toml
 config/jecalculation/record.json
 config/topaddons-client.toml
 config/diet-client.toml
-config/contentcreatorintegration/contentcreatorintegration-common.toml
-config/contentcreatorintegration/contentcreatorintegration.toml
+config/contentcreatorintegration/contentcreatorintegration-common.toml
+config/contentcreatorintegration/contentcreatorintegration.toml
 config/contentcreatorintegration/default/constants.json
 config/fml.toml

automation/.build.json

@@ -3,5 +3,13 @@
     "minecraftVersion": "1.16.5",
     "modLoader": "forge",
     "modLoaderVersion": "36.1.31",
-    "includes": ["building_gadgets_patterns", "config", "defaultconfigs", "kubejs", "packmenu", "patchouli_books"]
+    "includes": [
+        "building_gadgets_patterns",
+        "config",
+        "defaultconfigs",
+        "kubejs",
+        "local",
+        "packmenu",
+        "patchouli_books"
+    ]
 }

automation/modpack-uploader.ps1

@@ -111,6 +111,14 @@ function Remove-BlacklistedFiles {
                 Write-Host "Removing config $config from client files"
                 7z d "$InstanceRoot/$CLIENT_ZIP_NAME.zip" "overrides/config/$config*" | Out-Null
             }
+
+            foreach ($folder in $FOLDERS_TO_REMOVE_FROM_CLIENT_FILES) {
+                Write-Host "Removing folder $folder from client files"
+                7z d "$InstanceRoot/$CLIENT_ZIP_NAME.zip" "overrides/$folder*" -r | Out-Null
+            } 
+
+            # Remove all .bak files
+            7z d "$InstanceRoot/$CLIENT_ZIP_NAME.zip" "*.bak" -r | Out-Null
         }
     }
 }
@@ -287,10 +295,10 @@ function New-GitHubRelease {
         Write-Host 
 
         Invoke-RestMethod -Headers $Headers -Uri $Uri -Body $Body -Method Post
-		$currentLocation = Get-Location
-		Set-Location $InstanceRoot
+        $currentLocation = Get-Location
+        Set-Location $InstanceRoot
         Start-Process Powershell.exe -Argument "-NoProfile -Command github_changelog_generator --since-tag $CHANGES_SINCE_VERSION"
-		Set-Location $currentLocation
+        Set-Location $currentLocation
     }
 }
 

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "0.5.3"
+$MODPACK_VERSION = "0.5.4"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.2"
+$LAST_MODPACK_VERSION = "0.5.3"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS
@@ -148,6 +148,8 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
 	"contentcreatorintegration/default/constants.json"
 )
 
+$FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data")
+
 #=====================================================================//
 #  SERVER FILE SETTINGS
 #=====================================================================//

config/resourcefulbees/bees/magic/Starry.json

@@ -3,11 +3,12 @@
     "maxTimeInHive": 4800,
     "hasHoneycomb": true,
     "traits": ["can_swim"],
+    "baseLayerTexture": "other/starry",
     "ColorData": {
-        "honeycombColor": "#C0C0C0",
-        "isBeeColored": true,
-        "primaryColor": "#C0C0C0",
-        "secondaryColor": "#00FFBF"
+        "honeycombColor": "#062D86",
+        "isBeeColored": false,
+        "primaryColor": "#0E1250",
+        "secondaryColor": "#ACB5F8"
     },
     "CombatData": {
         "isPassive": false,
@@ -21,3 +22,4 @@
     "BreedData": {"isBreedable": false},
     "TraitData": {"hasTraits": true}
 }
+

kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js

@@ -134,7 +134,6 @@ onEvent('recipes', (event) => {
         'immersiveengineering:crafting/stick_aluminum',
         'immersiveengineering:crafting/stick_iron',
         'immersiveengineering:crusher/bone_meal',
-        'immersiveengineering:crafting/jerrycan',
 
         'immersivepetroleum:distillationtower/oilcracking',
 

local/ftbchunks/client-config.snbt

@@ -0,0 +1,144 @@
+{
+	# Chunk grid overlay in large map
+	# Default: false
+	chunk_grid: false
+
+	# Show claimed chunks on the map
+	# Default: true
+	claimed_chunks_on_map: true
+
+	# Enables creation of death waypoints
+	# Default: true
+	death_waypoints: false
+
+	# Enables debug info
+	# Default: false
+	debug_info: false
+
+	# Advanced option. Foliage darkness
+	# Default: 50
+	# Range: 0 ~ 255
+	foliage_darkness: 50
+
+	# Advanced option. Grass darkness
+	# Default: 50
+	# Range: 0 ~ 255
+	grass_darkness: 50
+
+	# Show waypoints in world
+	# Default: true
+	in_world_waypoints: false
+
+	# Different ways to render map
+	# Default: "none"
+	# Valid values: "none", "night", "topography", "blocks", "biome_temperature", "light_sources"
+	map_mode: "none"
+
+	# Noise added to map to make it look less plastic
+	# Default: 0.05d
+	# Range: 0.0d ~ 0.5d
+	noise: 0.05d
+
+	# Show your own claimed chunks on the map
+	# Default: true
+	own_claimed_chunks_on_map: false
+
+	# Reduces color palette to 256 colors
+	# Default: false
+	reduced_color_palette: false
+
+	# Advanced option. How often map render update will be queued
+	# Default: 60
+	# Range: 1 ~ 600
+	rerender_queue_ticks: 60
+
+	# Color intensity
+	# Default: 1.0d
+	# Range: 0.0d ~ 1.0d
+	saturation: 1.0d
+
+	# Shadow intensity
+	# Default: 0.1d
+	# Range: 0.0d ~ 0.3d
+	shadows: 0.1d
+
+	# Advanced option. Max tasks that can queue up
+	# Default: 100
+	# Range: 1 ~ 10000
+	task_queue_max: 100
+
+	# Advanced option. How often queued tasks will run
+	# Default: 4
+	# Range: 1 ~ 300
+	task_queue_ticks: 4
+
+	# How many blocks should height checks skip in water. 0 means flat water, ignoring terrain
+	# Default: 8
+	# Range: 0 ~ 128
+	water_height_factor: 8
+
+	# Advanced option. Water visibility
+	# Default: 220
+	# Range: 0 ~ 255
+	water_visibility: 220
+	minimap: {
+		# Show biome under minimap
+		# Default: true
+		biome: false
+
+		# Blurs minimap
+		# Default: true
+		blur: false
+
+		# Adds NWSE compass inside minimap
+		# Default: true
+		compass: false
+
+		# Show entities on minimap
+		# Default: true
+		entities: false
+
+		# Show entity heads on minimap
+		# Default: true
+		entity_heads: false
+
+		# Entities in minimap will be larger
+		# Default: false
+		large_entities: false
+
+		# Minimap will not rotate
+		# Default: true
+		locked_north: false
+
+		# Show player heads on minimap
+		# Default: true
+		player_heads: false
+
+		# Enables minimap to show up in corner
+		# Default: "top_right"
+		# Valid values: "disabled", "bottom_left", "left", "top_left", "top_right", "right", "bottom_right"
+		position: "disabled"
+
+		# Scale of minimap
+		# Default: 1.0d
+		# Range: 0.25d ~ 4.0d
+		scale: 1.0d
+
+		# Minimap visibility
+		# Default: 255
+		# Range: 0 ~ 255
+		visibility: 255
+
+		# Show waypoints on minimap
+		# Default: true
+		waypoints: false
+
+		# Show XYZ under minimap
+		# Default: true
+		xyz: false
+
+		# Show zone (claimed chunk or wilderness) under minimap
+		# Default: true
+		zone: false
+	}
+}