Merge pull request #3623 from NillerMedDild/develop

0.5.18

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "0.5.17"
+$MODPACK_VERSION = "0.5.18"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.16"
+$LAST_MODPACK_VERSION = "0.5.17"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS

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"]
+	cardboardModBlacklist = ["refinedstorage", "tetra", "storagedrawers", "lootr", "extrastorage", "astralsorcery", "waystones", "powah", "pneumaticcraft"]
 	#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/chiselsandbits-client.toml

@@ -0,0 +1,76 @@
+
+#Gameplay settings
+[settings]
+
+	#Bit-Bag settings
+	[settings.bit-bag]
+		#Should the durability bar display the emptiness of the bag instead of the fullness?
+		invert-durability-bar-indication = false
+
+	#Configures the tool mode icons used to render the selected tool modes of tools in the hot bar.
+	[settings.selected-tool-mode-icons]
+		#Sets which tool mode icon renderer is in use. Currently C&B provides: `chiselsandbits:group` (Render the group icon in the top right corner) and `chiselsandbits:noop` (No icon) as options.
+		renderer = "chiselsandbits:group"
+
+	#Configures the chiseling and placement previews.
+	[settings.chiseling-previews]
+		#Sets which preview renderer is in use. Currently C&B provides: `chiselsandbits:default` (Simple outline rendering) and `chiselsandbits:noop` (No preview) as options.
+		renderer = "chiselsandbits:default"
+
+		#Configures the default chiseling and placement preview.
+		[settings.chiseling-previews.default]
+
+			#Configures the colors of the outlines that the chiseling and placement preview have.
+			[settings.chiseling-previews.default.colors]
+				#The color for the chiseling preview outline.
+				chiseling = [0.85, 0.0, 0.0, 0.65]
+				#The color for the placement preview outline.
+				placement = [0.0, 0.85, 0.0, 0.65]
+
+#Performance related options.
+[performance]
+
+	#Configures caches
+	[performance.caches]
+
+		#Cache size related options.
+		[performance.caches.sizes]
+			#Size of the bit storage inner models cache.
+			#Range: 0 ~ 9223372036854775807
+			bit-storage-content-models = 100
+			#Size of the block model cache.
+			#Range: 3500 ~ 20000
+			block-models = 10000
+			#Size of the model face cache.
+			#Range: 3500 ~ 20000
+			block-faces = 10000
+
+	#Options related to the building of the chiseled block models.
+	[performance.model-building]
+		#How many CPU threads should be used to build models?
+		#Range: 1 ~ 4
+		thead-count = 2
+
+	#Lighting related options.
+	[performance.lighting]
+		#Should C&B pull lighting values from model faces.
+		extract-lighting-values-from-faces = true
+		#Should C&B pull lighting values from blockstates.
+		extract-lighting-values-from-blockstates = true
+
+#Options for the GUI
+[gui]
+
+	#Options for the radial menu.
+	[gui.radial-menu]
+		#Should the mouse indicator be rendered?
+		display-mouse-indicator = false
+
+#Configures options related to different compatibility modules.
+[compat]
+
+	#Compatibility options for JEI.
+	[compat.jei]
+		#Should C&B inject its bits into JEI?
+		inject-bits = false
+

config/chiselsandbits-common.toml

@@ -1,28 +1,18 @@
 
-[common]
-
-	#Configuration entries related to the help system.
-	[common.help]
-
-		[common.help.common]
-
-			[common.help.common.help]
-				#Common configuration entries related to the help system and which features are enabled or not during displayment.
-				enabled = true
-
-	[common.common]
-
-		#Configuration entries related to performance.
-		[common.common.performance]
-
-			[common.common.performance.common]
-
-				[common.common.performance.common.performance]
-
-					[common.common.performance.common.performance.collisions]
-
-						[common.common.performance.common.performance.collisions.cache]
-							#common.performance.collisions.cache.size
-							#Range: -9223372036854775808 ~ 9223372036854775807
-							size = 10000
+#Options for getting help in game.
+[help]
+	#Should the help information be visible in tooltips?
+	enabled-in-tooltips = true
+
+#Performance related options.
+[performance]
+
+	#Configures caches
+	[performance.caches]
+
+		#Cache size related options.
+		[performance.caches.sizes]
+			#Size of the collision box cache.
+			#Range: -9223372036854775808 ~ 9223372036854775807
+			collision-boxes = 10000
 

config/configswapper/expert/config/mininggadgets-common.toml

@@ -0,0 +1,62 @@
+
+#Upgrade Cost Settings
+[power.upgrades]
+	#Cost per Light Block placed
+	#Range: > 0
+	upgradeLight = 500
+	#Cost per block for Silk Touch upgrade
+	#Range: > 0
+	upgradeSilkCost = 5000
+	#Cost per block Frozen
+	#Range: > 0
+	upgradeFreeze = 500
+	#Cost per block for Fortune 1 upgrade
+	#Range: > 0
+	upgradeFortune1 = 1000
+	#Cost per block for Fortune 2 upgrade
+	#Range: > 0
+	upgradeFortune2 = 4000
+	#Cost per block for Fortune 3 upgrade
+	#Range: > 0
+	upgradeFortune3 = 6000		
+	#Capacity Boost from Battery 1 Upgrade
+	#Range: > 0
+	battery1 = 4800000
+	#Capacity Boost from Battery 2 Upgrade
+	#Range: > 0
+	battery2 = 19200000
+	#Capacity Boost from Battery 3 Upgrade
+	#Range: > 0
+	battery3 = 76800000
+	#Cost per block for Efficiency 1 upgrade
+	#Range: > 0
+	upgradeEfficiency1 = 100
+	#Cost per block for Efficiency 2 upgrade
+	#Range: > 0
+	upgradeEfficiency2 = 200
+	#Cost per block for Efficiency 3 upgrade
+	#Range: > 0
+	upgradeEfficiency3 = 450
+	#Cost per block for Efficiency 4 upgrade
+	#Range: > 0
+	upgradeEfficiency4 = 1200
+	#Cost per block for Efficiency 5 upgrade
+	#Range: > 0
+	upgradeEfficiency5 = 3500
+	#Cost per block for Magnet upgrade
+	#Range: > 0
+	upgradeMagnet = 250
+	#Cost per block for Void Junk upgrade
+	#Range: > 0
+	upgradeVoid = 100
+
+
+#Mining Gadget Settings
+[power.mining_gadget]
+	#Base cost per block broken
+	#Range: > 0
+	baseCost = 1000
+	#Maximum power for the Mining Gadget
+	#Range: > 0
+	maxPower = 500000
+

config/configswapper/normal/config/mininggadgets-common.toml

@@ -0,0 +1,62 @@
+
+#Upgrade Cost Settings
+[power.upgrades]	
+	#Cost per Light Block placed
+	#Range: > 0
+	upgradeLight = 100
+	#Cost per block for Silk Touch upgrade
+	#Range: > 0
+	upgradeSilkCost = 100
+	#Cost per block Frozen
+	#Range: > 0
+	upgradeFreeze = 100
+	#Cost per block for Fortune 1 upgrade
+	#Range: > 0
+	upgradeFortune1 = 30
+	#Cost per block for Fortune 2 upgrade
+	#Range: > 0
+	upgradeFortune2 = 60
+	#Cost per block for Fortune 3 upgrade
+	#Range: > 0
+	upgradeFortune3 = 100		
+	#Capacity Boost from Battery 1 Upgrade
+	#Range: > 0
+	battery1 = 2000000
+	#Capacity Boost from Battery 2 Upgrade
+	#Range: > 0
+	battery2 = 5000000
+	#Capacity Boost from Battery 3 Upgrade
+	#Range: > 0
+	battery3 = 10000000
+	#Cost per block for Efficiency 1 upgrade
+	#Range: > 0
+	upgradeEfficiency1 = 10
+	#Cost per block for Efficiency 2 upgrade
+	#Range: > 0
+	upgradeEfficiency2 = 20	
+	#Cost per block for Efficiency 3 upgrade
+	#Range: > 0
+	upgradeEfficiency3 = 30
+	#Cost per block for Efficiency 4 upgrade
+	#Range: > 0
+	upgradeEfficiency4 = 40
+	#Cost per block for Efficiency 5 upgrade
+	#Range: > 0
+	upgradeEfficiency5 = 50
+	#Cost per block for Magnet upgrade
+	#Range: > 0	
+	upgradeMagnet = 25
+	#Cost per block for Void Junk upgrade
+	#Range: > 0
+	upgradeVoid = 10
+
+
+#Mining Gadget Settings
+[power.mining_gadget]
+	#Base cost per block broken
+	#Range: > 0
+	baseCost = 200
+	#Maximum power for the Mining Gadget
+	#Range: > 0
+	maxPower = 1000000
+

config/connectivity-common.toml

@@ -4,7 +4,7 @@
 	disableLoginLimits = true
 	#Should play packet size limits be disabled? Error:(Badly compressed packet) default:true
 	disablePacketLimits = true
-	#If enabled all messages exceeding normal limits will be printed to log. default:false
+	#If enabled all packets exceeding normal limits will be printed to log. default:false
 	debugPrintMessages = false
 	#Set the max login timeout in ticks. 20 ticks = 1 sec, default = 120 seconds
 	#Range: 600 ~ 20000