Merge pull request #2207 from AllTheMods/Staging

1.7.10

config/allthetweaks-common.toml

@@ -21,5 +21,5 @@
 [packversionminrev]
 	#Pack Minor Version Revision : X
 	#Range: 0 ~ 32768
-	minorrev = 9
+	minorrev = 10
 

config/cabletiers-client.toml

@@ -42,4 +42,12 @@ ultraenergycost = 4
 #Creative Energy Cost Multiplier
 #Range: > 0
 creativeenergycost = 0
+#
+#Elite Disk Manipulator Speed
+#Range: 1 ~ 20
+elitediskmanipulatorspeed = 2
+#
+#Ultra Disk Manipulator Speed
+#Range: 1 ~ 20
+ultradiskmanipulatorspeed = 6
 

config/connectivity-common.toml

@@ -0,0 +1,20 @@
+
+["Connectivity settings"]
+	#Should login packet size limits be disabled? Error:(IOException("Payload may not be larger than 1048576 bytes")) default:true
+	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
+	debugPrintMessages = false
+	#Set the max login timeout in ticks. 20 ticks = 1 sec, default = 120 seconds
+	#Range: 600 ~ 20000
+	logintimeout = 4800
+	#Set the ingame disconnect timeout for disconnecting players. Default = 60sec
+	#Range: 15 ~ 400
+	disconnectTimeout = 60
+	#Set the amount of minutes for which network packet history data is saved. Default = 5 minutes
+	#Range: 1 ~ 400
+	packetHistoryMinutes = 5
+	#Enable to see the full log output for all resource location exceptions. Default = false
+	showFullResourceLocationException = false
+

config/creativeapiary-common.toml

@@ -0,0 +1,28 @@
+#
+#Tier Creative Apiary Output
+#Allowed Values: BLOCK
+tierCreativeApiaryOutput = "BLOCK"
+#
+#Tier Creative Apiary Quantity 
+# How many Combs/Blocks per Bees?
+#Range: > 1
+tierCreativeApiaryQuantity = 100
+#
+#Tier Creative Apiary Max Bees
+#Range: > 1
+tierCreativeApiaryMaxBees = 100
+#
+#Tier Creative Apiary Max Time in Hive (Value in %) 
+#For example 0.7 = 70% reduction
+#Range: 0.0 ~ 1.0
+tierCreativeApiaryMaxTimeInHive = 1.0
+#
+#Creative Apiary Breeder Speed (Value in %) 
+#For example 0.7 = 70% reduction
+#Range: 0.0 ~ 1.0
+CreativeApiaryBreederSpeed = 1.0
+#
+#Creative Apiary Breeder Item Max Stack Size
+#Range: > 1
+CreativeApiaryStorageItemMaxStackSize = 16384
+

config/elementalcraft-common.toml

@@ -126,6 +126,17 @@
 		#Range: 0.0 ~ 2400.0
 		groveShrinePeriode = 200.0
 
+	[shrines.springShrine]
+		#The amount of element consumed by the spring Shrine.
+		#Range: 0 ~ 10000
+		springShrineConsumeAmount = 5
+		#The nember of tick betwenn two spring Shrine activations.
+		#Range: 0.0 ~ 2400.0
+		springShrinePeriode = 5.0
+		#The amound of water filling a tank with a filling shrine upgrades.
+		#Range: 0.0 ~ 10000.0
+		springShrineFilling = 100.0
+
 #Instruments config
 [instruments]
 

config/ftbquests/quests/chapters/atm.snbt

@@ -185,5 +185,35 @@
 				item: "pamhc2foodextended:brownieitem"
 			}]
 		}
+		{
+			title: "Automating the Gaia Guardian"
+			x: -3.0d
+			y: -4.5d
+			description: [
+				"Normally, you can't automate the Guardian. It's a lot of manual labor to make the ATM Star!"
+				""
+				"Well, we've fixed that! You can now use Woot to automate* Guardian farming for the ATM Star."
+				""
+				"The Gaia Guardian requires a tier V Woot farm, and one Gaia Spirit Ingot per spawn."
+				""
+				"* (The guardian will only drop gaia spirits and wills - you can't have it all!)"
+			]
+			id: "2BAB9C6C03540D90"
+			tasks: [{
+				id: "4A080582AC11BEB1"
+				type: "item"
+				item: {
+					id: "woot:mobshard"
+					Count: 1b
+					tag: {
+						Mob: {
+							keyTag: ""
+							keyEntity: "botania:doppleganger"
+						}
+						Kills: 5
+					}
+				}
+			}]
+		}
 	]
 }

config/ftbultimine.snbt

@@ -1,7 +1 @@
-{
-	# (This only works if the mod 'Lost Trinkets' is installed!)
-	# Adds a custom 'Ultiminer' trinket players will need to activate to be able to use Ultimine
-	# Make sure you disable the 'Octopick' trinket if this is enabled!
-	# Default: false
-	use_trinket: false
-}
+{ }

config/industrialforegoing/machine-misc.toml

@@ -39,7 +39,7 @@
 		#Max Essence [mb] - Default: [64000 mb]
 		tankSize = 32000
 		#Ignore max level for enchanting
-		ignoreEnchantMaxLevels = false
+		ignoreEnchantMaxLevels = true
 
 	[MachineMiscConfig.EnchantmentExtractorConfig]
 		#Amount of Power Consumed per Tick - Default: [40FE]

config/ironfurnaces-client.toml

@@ -7,3 +7,144 @@
 		# Default: true.
 		updates = false
 
+#Furnace Settings
+[furnaces]
+
+	[furnaces.iron_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 160
+		#Range: 2 ~ 72000
+		speed = 160
+
+	[furnaces.gold_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 120
+		#Range: 2 ~ 72000
+		speed = 120
+
+	[furnaces.diamond_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 80
+		#Range: 2 ~ 72000
+		speed = 80
+
+	[furnaces.emerald_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 40
+		#Range: 2 ~ 72000
+		speed = 40
+
+	[furnaces.obsidian_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 20
+		#Range: 2 ~ 72000
+		speed = 20
+
+	[furnaces.crystal_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 40
+		#Range: 2 ~ 72000
+		speed = 40
+
+	[furnaces.netherite_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 5
+		#Range: 2 ~ 72000
+		speed = 5
+
+	[furnaces.copper_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 180
+		#Range: 2 ~ 72000
+		speed = 180
+
+	[furnaces.silver_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 140
+		#Range: 2 ~ 72000
+		speed = 140
+
+	[furnaces.rainbow_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 20
+		#Range: 2 ~ 72000
+		speed = 20
+
+	[furnaces.furance_xp_drop]
+		# This value indicates when the furnace should 'overload' and spit out the xp stored. 
+		# Default: 10, Recipes
+		#Range: 1 ~ 500
+		value = 10
+		# This value indicates when the furnace should 'overload' and spit out the xp stored. 
+		# Default: 100000, Single recipe uses
+		#Range: 1 ~ 1000000
+		value_two = 100000
+
+#Modded Furnace Settings
+[modded_furnaces]
+
+	[modded_furnaces.allthemodium_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 5
+		#Range: 1 ~ 72000
+		speed = 5
+		# Number of items that can be smelted at once. The regular furnace only smelts 1 item at once of course.
+		# Default: 16
+		#Range: 1 ~ 64
+		mult = 16
+
+	[modded_furnaces.vibranium_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 3
+		#Range: 1 ~ 72000
+		speed = 3
+		# Number of items that can be smelted at once. The regular furnace only smelts 1 item at once of course.
+		# Default: 32
+		#Range: 1 ~ 64
+		mult = 32
+
+	[modded_furnaces.unobtanium_furnace]
+		# Number of ticks to complete one smelting operation.
+		# 200 ticks is what a regular furnace takes.
+		# Default: 1
+		#Range: 1 ~ 72000
+		speed = 1
+		# Number of items that can be smelted at once. The regular furnace only smelts 1 item at once of course.
+		# Default: 64
+		#Range: 1 ~ 64
+		mult = 64
+
+#JEI Settings
+[jei]
+
+	[jei.jei]
+		# Enable or disable the JeiPlugin of Iron Furnaces.
+		enable_jei = true
+		# Enable or disable the Catalysts in Jei for Iron Furnaces.
+		enable_jei_catalysts = true
+		# Enable or disable the Click Area inside the GUI in all of Iron Furnaces' furnaces.
+		enable_jei_click_area = true
+
+#Misc
+[misc]
+
+	[misc.misc]
+		# Given or not given the Rainbow Coal to our champion
+		coal = false
+		# Enable or disable the Rainbow Content
+		rainbow = true
+		# Show furnace settings errors in chat, used for debugging
+		errors = false
+