Merge pull request #2126 from AllTheMods/Staging

 1.7.7 merge

README.md

@@ -1,5 +1,6 @@
 # [![ATM6](https://cdn.discordapp.com/attachments/668300600995348490/871544530023895090/atm6_banner.png)](https://discord.gg/K5FBPYa)
 
+
 All The Mods 6
 ======
 This is the official repository and issue-tracker for All The Mods 6 1.16.4

config/Mekanism/tiers.toml

@@ -4,42 +4,42 @@
 
 	#Chemical Tanks
 	[tier.chemical_tanks]
-		#Output rate of Advanced chemical tanks in mB.
-		#Range: 1 ~ 9223372036854775807
-		advancedOutput = 512
-		#Storage size of Ultimate chemical tanks in mB.
-		#Range: 1 ~ 9223372036854775807
-		ultimateStorage = 512000
-		#Output rate of Ultimate chemical tanks in mB.
-		#Range: 1 ~ 9223372036854775807
-		ultimateOutput = 2056
-		#Storage size of Creative chemical tanks in mB.
-		#Range: 1 ~ 9223372036854775807
-		creativeStorage = 9223372036854775807
 		#Output rate of Basic chemical tanks in mB.
 		#Range: 1 ~ 9223372036854775807
-		basicOutput = 256
+		basicOutput = 640
 		#Storage size of Basic chemical tanks in mB.
 		#Range: 1 ~ 9223372036854775807
 		basicStorage = 64000
+		#Output rate of Advanced chemical tanks in mB.
+		#Range: 1 ~ 9223372036854775807
+		advancedOutput = 5120
+		#Storage size of Advanced chemical tanks in mB.
+		#Range: 1 ~ 9223372036854775807
+		advancedStorage = 512000
+		#Output rate of Elite chemical tanks in mB.
+		#Range: 1 ~ 9223372036854775807
+		eliteOutput = 80000
 		#Storage size of Elite chemical tanks in mB.
 		#Range: 1 ~ 9223372036854775807
-		eliteStorage = 256000
+		eliteStorage = 8000000
+		#Output rate of Ultimate chemical tanks in mB.
+		#Range: 1 ~ 9223372036854775807
+		ultimateOutput = 1280000
+		#Storage size of Ultimate chemical tanks in mB.
+		#Range: 1 ~ 9223372036854775807
+		ultimateStorage = 128000000
 		#Output rate of Creative chemical tanks in mB.
 		#Range: 1 ~ 9223372036854775807
 		creativeOutput = 4611686018427387903
-		#Storage size of Advanced chemical tanks in mB.
-		#Range: 1 ~ 9223372036854775807
-		advancedStorage = 128000
-		#Output rate of Elite chemical tanks in mB.
+		#Storage size of Creative chemical tanks in mB.
 		#Range: 1 ~ 9223372036854775807
-		eliteOutput = 1028
+		creativeStorage = 9223372036854775807
 
 	#Bins
 	[tier.bins]
 		#The number of items Ultimate bins can store.
 		#Range: > 1
-		ultimateStorage = 262144
+		ultimateStorage = 16777216
 		#The number of items Creative bins can store.
 		#Range: > 1
 		creativeStorage = 2147483647
@@ -48,10 +48,10 @@
 		basicStorage = 4096
 		#The number of items Elite bins can store.
 		#Range: > 1
-		eliteStorage = 32768
+		eliteStorage = 524288
 		#The number of items Advanced bins can store.
 		#Range: > 1
-		advancedStorage = 8192
+		advancedStorage = 32768
 
 	#Induction
 	[tier.induction]
@@ -119,81 +119,81 @@
 			#Pump rate of Basic pressurized tubes in mB/t.
 			#Range: 1 ~ 9223372036854775807
 			basicPullAmount = 1000
-			#Pump rate of Advanced pressurized tubes in mB/t.
-			#Range: 1 ~ 9223372036854775807
-			advancedPullAmount = 4000
 			#Capacity of Basic pressurized tubes in mB.
 			#Range: 1 ~ 9223372036854775807
 			basicCapacity = 8000
-			#Pump rate of Elite pressurized tubes in mB/t.
-			#Range: 1 ~ 9223372036854775807
-			elitePullAmount = 128000
-			#Capacity of Ultimate pressurized tubes in mB.
+			#Pump rate of Advanced pressurized tubes in mB/t.
 			#Range: 1 ~ 9223372036854775807
-			ultimateCapacity = 16000000
+			advancedPullAmount = 4000
 			#Capacity of Advanced pressurized tubes in mB.
 			#Range: 1 ~ 9223372036854775807
 			advancedCapacity = 64000
+			#Pump rate of Elite pressurized tubes in mB/t.
+			#Range: 1 ~ 9223372036854775807
+			elitePullAmount = 128000
 			#Capacity of Elite pressurized tubes in mB.
 			#Range: 1 ~ 9223372036854775807
 			eliteCapacity = 1000000
 			#Pump rate of Ultimate pressurized tubes in mB/t.
 			#Range: 1 ~ 9223372036854775807
 			ultimatePullAmount = 1024000
+			#Capacity of Ultimate pressurized tubes in mB.
+			#Range: 1 ~ 9223372036854775807
+			ultimateCapacity = 16000000
 
 		#Mechanical Pipes
 		[tier.transmitters.fluid]
 			#Pump rate of Basic mechanical pipes in mB/t.
 			#Range: > 1
 			basicPullAmount = 512
-			#Pump rate of Advanced mechanical pipes in mB/t.
-			#Range: > 1
-			advancedPullAmount = 1000
 			#Capacity of Basic mechanical pipes in mB.
 			#Range: > 1
 			basicCapacity = 4000
-			#Pump rate of Elite mechanical pipes in mB/t.
-			#Range: > 1
-			elitePullAmount = 16000
-			#Capacity of Ultimate mechanical pipes in mB.
+			#Pump rate of Advanced mechanical pipes in mB/t.
 			#Range: > 1
-			ultimateCapacity = 512000
+			advancedPullAmount = 4000
 			#Capacity of Advanced mechanical pipes in mB.
 			#Range: > 1
-			advancedCapacity = 8000
+			advancedCapacity = 16000
+			#Pump rate of Elite mechanical pipes in mB/t.
+			#Range: > 1
+			elitePullAmount = 16000
 			#Capacity of Elite mechanical pipes in mB.
 			#Range: > 1
 			eliteCapacity = 64000
 			#Pump rate of Ultimate mechanical pipes in mB/t.
 			#Range: > 1
 			ultimatePullAmount = 64000
+			#Capacity of Ultimate mechanical pipes in mB.
+			#Range: > 1
+			ultimateCapacity = 512000
 
 		#Logistical Transporters
 		[tier.transmitters.items]
 			#Item throughput rate of Basic logistical transporters in items/s.
 			#Range: > 1
-			basicPullAmount = 1
+			basicPullAmount = 8
+			#Five times travel speed of Basic logistical transporter.
+			#Range: > 1
+			basicSpeed = 16
 			#Item throughput rate of Advanced logistical transporters in items/s.
 			#Range: > 1
-			advancedPullAmount = 16
+			advancedPullAmount = 128
 			#Five times travel speed of Advanced logistical transporter.
 			#Range: > 1
-			advancedSpeed = 10
+			advancedSpeed = 32
 			#Item throughput rate of Elite logistical transporters in items/s.
 			#Range: > 1
-			elitePullAmount = 32
+			elitePullAmount = 256
 			#Five times travel speed of Elite logistical transporter.
 			#Range: > 1
-			eliteSpeed = 20
+			eliteSpeed = 64
 			#Item throughput rate of Ultimate logistical transporters in items/s.
 			#Range: > 1
-			ultimatePullAmount = 64
+			ultimatePullAmount = 512
 			#Five times travel speed of Ultimate logistical transporter.
 			#Range: > 1
-			ultimateSpeed = 50
-			#Five times travel speed of Basic logistical transporter.
-			#Range: > 1
-			basicSpeed = 5
+			ultimateSpeed = 128
 
 		#Universal Cables
 		[tier.transmitters.energy]
@@ -209,56 +209,56 @@
 	#Energy Cubes
 	[tier.energy_cubes]
 		#Output rate in Joules of Advanced energy cubes.
-		advancedOutput = "16000"
+		advancedOutput = "64000"
 		#Maximum number of Joules Ultimate energy cubes can store.
-		ultimateStorage = "256000000"
+		ultimateStorage = "4096000000"
 		#Output rate in Joules of Ultimate energy cubes.
-		ultimateOutput = "256000"
+		ultimateOutput = "4096000"
 		#Maximum number of Joules Creative energy cubes can store.
 		creativeStorage = "18446744073709551615.9999"
 		#Output rate in Joules of Basic energy cubes.
 		basicOutput = "4000"
 		#Maximum number of Joules Basic energy cubes can store.
 		basicStorage = "4000000"
 		#Maximum number of Joules Elite energy cubes can store.
-		eliteStorage = "64000000"
+		eliteStorage = "512000000"
 		#Output rate in Joules of Creative energy cubes.
 		creativeOutput = "18446744073709551615.9999"
 		#Maximum number of Joules Advanced energy cubes can store.
-		advancedStorage = "16000000"
+		advancedStorage = "64000000"
 		#Output rate in Joules of Elite energy cubes.
-		eliteOutput = "64000"
+		eliteOutput = "512000"
 
 	#Fluid Tanks
 	[tier.fluid_tanks]
 		#Output rate of Advanced fluid tanks in mB.
 		#Range: > 1
-		advancedOutput = 800
+		advancedOutput = 8000
 		#Storage size of Ultimate fluid tanks in mB.
 		#Range: > 1
-		ultimateStorage = 112000
+		ultimateStorage = 32768000
 		#Output rate of Ultimate fluid tanks in mB.
 		#Range: > 1
-		ultimateOutput = 3200
+		ultimateOutput = 32000
 		#Storage size of Creative fluid tanks in mB.
 		#Range: > 1
 		creativeStorage = 2147483647
 		#Output rate of Basic fluid tanks in mB.
 		#Range: > 1
-		basicOutput = 400
+		basicOutput = 4000
 		#Storage size of Basic fluid tanks in mB.
 		#Range: > 1
-		basicStorage = 14000
+		basicStorage = 64000
 		#Storage size of Elite fluid tanks in mB.
 		#Range: > 1
-		eliteStorage = 56000
+		eliteStorage = 4096000
 		#Output rate of Creative fluid tanks in mB.
 		#Range: > 1
 		creativeOutput = 1073741823
 		#Storage size of Advanced fluid tanks in mB.
 		#Range: > 1
-		advancedStorage = 28000
+		advancedStorage = 512000
 		#Output rate of Elite fluid tanks in mB.
 		#Range: > 1
-		eliteOutput = 1600
+		eliteOutput = 16000
 

config/allthetweaks-common.toml

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

config/ctiers-client.toml

@@ -1,18 +1,18 @@
 #
 #Centrifuge Tier 3 output Multiplier
-#Range: 1 ~ 150
+#Range: > 1
 centrifugeTier3Mutliplier = 2
 #
 #Centrifuge Tier 4 output Multiplier
-#Range: 1 ~ 150
+#Range: > 1
 centrifugeTier4Mutliplier = 3
 #
 #Centrifuge Tier 5 output Multiplier
-#Range: 1 ~ 150
+#Range: > 1
 centrifugeTier5Mutliplier = 4
 #
-#Centrifuge Tier output Multiplier
-#Range: 1 ~ 150
+#Centrifuge Tier Creative output Multiplier
+#Range: > 1
 centrifugeTierCreativeMutliplier = 10
 #
 #Centrifuge Tier 3 Recipe Time 
@@ -31,71 +31,68 @@ centrifugeTier4RecipeTime = 0.25
 centrifugeTier5RecipeTime = 0.125
 #
 #Centrifuge Tier Recipe Time 
-#The Value is the Tick for the Recipe Time
-#Range: 1 ~ 500
+#The Value is the Tick for the Recipe Time 
+#If you set the Value to 0 the Game will Crash :)
+#Range: -1 ~ 500
 centrifugeTierCreativeRecipeTime = 1
 #
 #Centrifuge Tier 3 RF per Block Multiplier
-#Range: 1 ~ 1000
+#Range: > 1
 centrifugeTier3RFPerBlockMutliplier = 2
 #
 #Centrifuge Tier 4 RF per Block Multiplier
-#Range: 1 ~ 1000
+#Range: > 1
 centrifugeTier4RFPerBlockMutliplier = 4
 #
 #Centrifuge Tier 5 RF per Block Multiplier
-#Range: 1 ~ 1000
+#Range: > 1
 centrifugeTier5RFPerBlockMutliplier = 8
 #
 #Centrifuge Tier 3 RF Capacity Multiplier
-#Range: 1 ~ 1500
+#Range: > 1
 centrifugeTier3CapacityMutliplier = 20
 #
 #Centrifuge Tier 4 RF Capacity Multiplier
-#Range: 1 ~ 1500
+#Range: > 1
 centrifugeTier4CapacityMutliplier = 40
 #
 #Centrifuge Tier 5 RF Capacity Multiplier
-#Range: 1 ~ 1500
+#Range: > 1
 centrifugeTier5CapacityMutliplier = 80
 #
 #Centrifuge Tier Creative 3x3x3 Size 
 #Should it be 3x3x3?
 centrifugeTierCreativeSize = false
 #
 #Centrifuge Tier 3 Max Tank Capacity
-#Range: 1 ~ 10000000
+#Range: > 1
 centrifugeTier3MaxTankCapacity = 100000
 #
 #Centrifuge Tier 4 Max Tank Capacity
-#Range: 1 ~ 10000000
+#Range: > 1
 centrifugeTier4MaxTankCapacity = 200000
 #
 #Centrifuge Tier 5 Max Tank Capacity
-#Range: 1 ~ 10000000
+#Range: > 1
 centrifugeTier5MaxTankCapacity = 400000
 #
 #Centrifuge Tier Creative Max Tank Capacity
-#Range: 1 ~ 10000000
+#Range: > 1
 centrifugeTierCreativeMaxTankCapacity = 5000000
 #
 #Centrifuge Tier 3 Item Max Stack Size
-#Range: 1 ~ 1048576
+#Range: > 1
 centrifugeTier3ItemMaxStackSize = 256
 #
 #Centrifuge Tier 4 Item Max Stack Size
-#Range: 1 ~ 1048576
+#Range: > 1
 centrifugeTier4ItemMaxStackSize = 512
 #
 #Centrifuge Tier 5 Item Max Stack Size
-#Range: 1 ~ 1048576
+#Range: > 1
 centrifugeTier5ItemMaxStackSize = 1024
 #
 #Centrifuge Tier Creative Item Max Stack Size
-#Range: 1 ~ 1048576
+#Range: > 1
 centrifugeTierCreativeItemMaxStackSize = 16384
-#
-#Do you want Compressed Blocks from this mod? 
-#Only disable if you have Compressium downloaded 
-#If not there will be no Crafting Recipes :)
-CompressedBlocks = false
+