1.70

mczph · mczph · commit 56b3e3d2e2b3 · 2024-08-18T20:13:11.000+08:00
diff --git a/config/calculator/Calculator-Config.cfg b/config/calculator/Calculator-Config.cfg
@@ -80,7 +80,7 @@ calculator {
     I:"Energy Storage"=50000000
     I:Generation=2000
     I:"Transfer Rate"=500000
-    I:"Weather Station Generation"=500
+    I:"Weather Station Generation"=1000
 }
 
 
diff --git a/config/enderstorage.cfg b/config/enderstorage.cfg
@@ -14,7 +14,7 @@ disableCreatorVisuals=false
 enableAutoCollectItem=minecraft:nether_star|0
 
 #If Ender Tank can be used in inventory slots as fluid capability provider.
-enderTankItemFluidHandler=true
+enderTankItemFluidHandler=false
 
 
 #The size of each inventory of EnderStorage. 0 = 3x3, 1 = 3x9, 2 = 6x9
diff --git a/config/entitydistance.cfg b/config/entitydistance.cfg
@@ -19,7 +19,7 @@ general {
     # Multiplier for entity track distance. Default is 1.0D (100%)
     # Min: 0.0
     # Max: 5.0
-    D:"Track Distance Multiplier"=0.8
+    D:"Track Distance Multiplier"=0.800000011920929
 
     # Whether to use the Mod GUI. Default is true.
     B:"Use Mod GUI"=true
diff --git a/config/flowingtime.cfg b/config/flowingtime.cfg
diff --git a/config/ftbquests/normal/chapters/9881d108/05629ac2.snbt b/config/ftbquests/normal/chapters/9881d108/05629ac2.snbt
@@ -1,6 +1,6 @@
 {
-	x: -3.5d,
-	y: 15.5d,
+	x: -5.5d,
+	y: 14.5d,
 	dependencies: [
 		"62e01842",
 		"81bde4ee"
diff --git a/config/ftbquests/normal/chapters/9881d108/07c195cd.snbt b/config/ftbquests/normal/chapters/9881d108/07c195cd.snbt
@@ -1,5 +1,5 @@
 {
-	x: -0.5d,
+	x: -1.0d,
 	y: 17.5d,
 	dependencies: [
 		"2301e937",
diff --git a/config/ftbquests/normal/chapters/9881d108/0974158b.snbt b/config/ftbquests/normal/chapters/9881d108/0974158b.snbt
@@ -1,5 +1,5 @@
 {
-	x: -1.5d,
+	x: -2.5d,
 	y: 17.5d,
 	dependencies: [
 		"c92d4307"
diff --git a/config/ftbquests/normal/chapters/9881d108/0b8d8c7f.snbt b/config/ftbquests/normal/chapters/9881d108/0b8d8c7f.snbt
@@ -1,6 +1,6 @@
 {
-	x: -3.5d,
-	y: 18.5d,
+	x: -5.5d,
+	y: 19.0d,
 	dependencies: [
 		"adf3c2eb",
 		"c92d4307"
diff --git a/config/ftbquests/normal/chapters/9881d108/0d808b40.snbt b/config/ftbquests/normal/chapters/9881d108/0d808b40.snbt
@@ -1,6 +1,6 @@
 {
-	x: -3.5d,
-	y: 16.5d,
+	x: -5.5d,
+	y: 16.0d,
 	dependencies: [
 		"05629ac2",
 		"81bde4ee"
diff --git a/config/ftbquests/normal/chapters/9881d108/1a2ba52e.snbt b/config/ftbquests/normal/chapters/9881d108/1a2ba52e.snbt
@@ -1,5 +1,5 @@
 {
-	x: -4.5d,
+	x: -7.0d,
 	y: 17.5d,
 	text: [
 		"{9881d108.ia.1a2ba52e}"
diff --git a/config/ftbquests/normal/chapters/9881d108/2301e937.snbt b/config/ftbquests/normal/chapters/9881d108/2301e937.snbt
@@ -1,6 +1,6 @@
 {
-	x: -1.5d,
-	y: 16.5d,
+	x: -2.5d,
+	y: 16.0d,
 	dependencies: [
 		"adfd7164"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/254ec2ab.snbt b/config/ftbquests/normal/chapters/9881d108/254ec2ab.snbt
@@ -1,6 +1,6 @@
 {
-	x: -1.5d,
-	y: 15.5d,
+	x: -2.5d,
+	y: 14.5d,
 	text: [
 		"{9881d108.ia.254ec2ab}"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/30ebb079.snbt b/config/ftbquests/normal/chapters/9881d108/30ebb079.snbt
@@ -1,7 +1,7 @@
 {
 	title: "{9881d108.ia.30ebb079.title}",
-	x: -3.5d,
-	y: 19.5d,
+	x: -4.0d,
+	y: 20.5d,
 	text: [
 		"{9881d108.ia.30ebb079}"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/4ff707f8.snbt b/config/ftbquests/normal/chapters/9881d108/4ff707f8.snbt
@@ -1,6 +1,6 @@
 {
-	x: -1.5d,
-	y: 18.5d,
+	x: -2.5d,
+	y: 19.0d,
 	dependencies: [
 		"07c195cd"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/5c46d3f5.snbt b/config/ftbquests/normal/chapters/9881d108/5c46d3f5.snbt
@@ -1,6 +1,6 @@
 {
-	x: -0.5d,
-	y: 16.5d,
+	x: -1.0d,
+	y: 16.0d,
 	dependencies: [
 		"975cb4bd",
 		"81bde4ee"
diff --git a/config/ftbquests/normal/chapters/9881d108/5e46f768.snbt b/config/ftbquests/normal/chapters/9881d108/5e46f768.snbt
@@ -1,6 +1,6 @@
 {
-	x: -4.0d,
-	y: 12.0d,
+	x: -5.0d,
+	y: 11.0d,
 	dependencies: [
 		"b26c5d68"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/62e01842.snbt b/config/ftbquests/normal/chapters/9881d108/62e01842.snbt
@@ -1,8 +1,7 @@
 {
-	x: -4.5d,
+	x: -7.0d,
 	y: 14.5d,
 	dependencies: [
-		"ece6538c",
 		"a91f0db9"
 	],
 	tasks: [{
diff --git a/config/ftbquests/normal/chapters/9881d108/65d80d5f.snbt b/config/ftbquests/normal/chapters/9881d108/65d80d5f.snbt
@@ -1,5 +1,5 @@
 {
-	x: -0.5d,
+	x: -1.0d,
 	y: 14.5d,
 	dependencies: [
 		"ece6538c"
diff --git a/config/ftbquests/normal/chapters/9881d108/75475952.snbt b/config/ftbquests/normal/chapters/9881d108/75475952.snbt
@@ -1,6 +1,6 @@
 {
-	x: -4.5d,
-	y: 15.5d,
+	x: -7.0d,
+	y: 16.0d,
 	dependencies: [
 		"62e01842"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/78385c76.snbt b/config/ftbquests/normal/chapters/9881d108/78385c76.snbt
@@ -1,6 +1,6 @@
 {
 	x: -4.0d,
-	y: 13.0d,
+	y: 12.0d,
 	dependencies: [
 		"b26c5d68",
 		"e06de638"
diff --git a/config/ftbquests/normal/chapters/9881d108/81bde4ee.snbt b/config/ftbquests/normal/chapters/9881d108/81bde4ee.snbt
@@ -1,6 +1,6 @@
 {
-	x: -2.5d,
-	y: 15.5d,
+	x: -4.0d,
+	y: 14.5d,
 	dependencies: [
 		"254ec2ab"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/8adcd97c.snbt b/config/ftbquests/normal/chapters/9881d108/8adcd97c.snbt
@@ -1,6 +1,6 @@
 {
-	x: -2.5d,
-	y: 18.5d,
+	x: -4.0d,
+	y: 19.0d,
 	text: [
 		"{9881d108.ia.8adcd97c}"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/9538a9d3.snbt b/config/ftbquests/normal/chapters/9881d108/9538a9d3.snbt
@@ -1,6 +1,6 @@
 {
-	x: -2.0d,
-	y: 13.0d,
+	x: -3.0d,
+	y: 12.0d,
 	dependencies: [
 		"b26c5d68"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/975cb4bd.snbt b/config/ftbquests/normal/chapters/9881d108/975cb4bd.snbt
@@ -1,6 +1,6 @@
 {
-	x: -0.5d,
-	y: 15.5d,
+	x: 0.5d,
+	y: 16.0d,
 	dependencies: [
 		"06244d0d",
 		"254ec2ab"
diff --git a/config/ftbquests/normal/chapters/9881d108/98e86d63.snbt b/config/ftbquests/normal/chapters/9881d108/98e86d63.snbt
@@ -1,6 +1,6 @@
 {
 	x: -2.5d,
-	y: 19.5d,
+	y: 20.5d,
 	dependencies: [
 		"8adcd97c"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/a9f4ebe0.snbt b/config/ftbquests/normal/chapters/9881d108/a9f4ebe0.snbt
@@ -1,6 +1,6 @@
 {
-	x: -1.5d,
-	y: 19.5d,
+	x: -5.5d,
+	y: 20.5d,
 	dependencies: [
 		"8adcd97c"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/ab8a98b6.snbt b/config/ftbquests/normal/chapters/9881d108/ab8a98b6.snbt
@@ -1,5 +1,5 @@
 {
-	x: -3.5d,
+	x: -5.5d,
 	y: 17.5d,
 	dependencies: [
 		"c92d4307"
diff --git a/config/ftbquests/normal/chapters/9881d108/adf3c2eb.snbt b/config/ftbquests/normal/chapters/9881d108/adf3c2eb.snbt
@@ -1,6 +1,6 @@
 {
-	x: -4.5d,
-	y: 18.5d,
+	x: -7.0d,
+	y: 19.0d,
 	dependencies: [
 		"1a2ba52e"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/adfd7164.snbt b/config/ftbquests/normal/chapters/9881d108/adfd7164.snbt
@@ -1,6 +1,6 @@
 {
-	x: -2.5d,
-	y: 16.5d,
+	x: -4.0d,
+	y: 16.0d,
 	dependencies: [
 		"0d808b40"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/b26c5d68.snbt b/config/ftbquests/normal/chapters/9881d108/b26c5d68.snbt
@@ -1,6 +1,6 @@
 {
-	x: -3.0d,
-	y: 12.0d,
+	x: -4.0d,
+	y: 11.0d,
 	dependencies: [
 		"391bcb74"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/c25ca916.snbt b/config/ftbquests/normal/chapters/9881d108/c25ca916.snbt
@@ -1,6 +1,6 @@
 {
-	x: -0.5d,
-	y: 19.5d,
+	x: -1.0d,
+	y: 20.5d,
 	dependencies: [
 		"4ff707f8"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/c92d4307.snbt b/config/ftbquests/normal/chapters/9881d108/c92d4307.snbt
@@ -1,5 +1,5 @@
 {
-	x: -2.5d,
+	x: -4.0d,
 	y: 17.5d,
 	text: [
 		"{9881d108.ia.c92d4307}"
diff --git a/config/ftbquests/normal/chapters/9881d108/e06de638.snbt b/config/ftbquests/normal/chapters/9881d108/e06de638.snbt
@@ -1,6 +1,6 @@
 {
-	x: -3.0d,
-	y: 14.0d,
+	x: -4.0d,
+	y: 13.0d,
 	dependencies: [
 		"7237d620"
 	],
diff --git a/config/ftbquests/normal/chapters/9881d108/e75583ab.snbt b/config/ftbquests/normal/chapters/9881d108/e75583ab.snbt
@@ -1,6 +1,6 @@
 {
-	x: -0.5d,
-	y: 18.5d,
+	x: -1.0d,
+	y: 19.0d,
 	dependencies: [
 		"c635b8b8",
 		"4ff707f8"
@@ -11,5 +11,13 @@
 		items: [{
 			item: "calculator:calculatorlocator"
 		}]
+	},
+	{
+		uid: "9507f24d",
+		type: "item",
+		items: [{
+			item: "calculator:calculatorplug"
+		}],
+		count: 4L
 	}]
 }
diff --git a/config/ftbquests/normal/chapters/9881d108/ece6538c.snbt b/config/ftbquests/normal/chapters/9881d108/ece6538c.snbt
@@ -1,7 +1,7 @@
 {
 	title: "{9881d108.ia.ece6538c.title}",
 	x: -1.5d,
-	y: 14.5d,
+	y: 13.5d,
 	text: [
 		"{9881d108.ia.ece6538c.1}",
 		"{9881d108.ia.ece6538c.2}"
diff --git a/config/ftbquests/normal/chapters/bd1b7a20/89928471.snbt b/config/ftbquests/normal/chapters/bd1b7a20/89928471.snbt
@@ -57,9 +57,9 @@
 		}
 	},
 	{
-		uid: "2827fd69",
-		type: "item",
-		item: "tce:tce_torch_lvl1",
-		count: 2
+		uid: "09950b83",
+		type: "gamestage",
+		auto: "no_toast",
+		stage: "start"
 	}]
 }
diff --git a/config/ftbquests/normal/chapters/cd4fea27/a5a7e728.snbt b/config/ftbquests/normal/chapters/cd4fea27/a5a7e728.snbt
@@ -0,0 +1,15 @@
+{
+	x: 5.0d,
+	y: 5.5d,
+	tasks: [{
+		uid: "eaec20ea",
+		type: "gamestage",
+		icon: "tce:tce_torch_lvl1",
+		stage: "speed"
+	}],
+	rewards: [{
+		uid: "1d269a70",
+		type: "item",
+		item: "tce:tce_torch_lvl1"
+	}]
+}
diff --git a/config/ftbquests/normal/chapters/cd4fea27/e84c3fbb.snbt b/config/ftbquests/normal/chapters/cd4fea27/e84c3fbb.snbt
diff --git a/config/hammercore.cfg b/config/hammercore.cfg
@@ -6,7 +6,7 @@ client {
 
     # Should Hammer Core portforward your local world when you share with it to LAN?
     # This feature doesn't work on all clients, you are going to get a message in chat if it was successful/unsuccessful [default: true]
-    B:"LAN UPnP"=true
+    B:"LAN UPnP"=false
 
     # Replace vanilla furnace and brewing stand progress bars to use smooth rendering? [default: true]
     B:"Smooth Vanilla Guis"=true
diff --git a/config/tweakedpetroleum.cfg b/config/tweakedpetroleum.cfg
@@ -4,7 +4,7 @@ general {
 
     "default reservoirs" {
         # This will enable reservoir registration from IP's configs, default=true
-        B:"Register Reservoirs From Config"=true
+        B:"Register Reservoirs From Config"=false
 
         "default pumpjack power tiers" {
             # This will set the capacity of the pumpjack, default=16000
diff --git a/groovy/postInit/EnderIOSliceNSplice.groovy b/groovy/postInit/EnderIOSliceNSplice.groovy
diff --git a/scripts/GameStages/time.zs b/scripts/GameStages/time.zs
diff --git a/scripts/gamestages/ban.zs b/scripts/gamestages/ban.zs
diff --git a/scripts/loot/LootTableTweaker.zs b/scripts/loot/LootTableTweaker.zs
diff --git a/scripts/recipes/Immersive/Excavation.zs b/scripts/recipes/Immersive/Excavation.zs
diff --git a/scripts/recipes/misc/TCE.zs b/scripts/recipes/misc/TCE.zs
diff --git a/scripts/recipes/mods/BOT.zs b/scripts/recipes/mods/BOT.zs
diff --git a/scripts/recipes/mods/NCO.zs b/scripts/recipes/mods/NCO.zs

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ calculator {`
`80`	`80`	`I:"Energy Storage"=50000000`
`81`	`81`	`I:Generation=2000`
`82`	`82`	`I:"Transfer Rate"=500000`
`83`		`- I:"Weather Station Generation"=500`
	`83`	`+ I:"Weather Station Generation"=1000`
`84`	`84`	`}`
`85`	`85`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- x: -3.5d,`
`3`		`- y: 15.5d,`
	`2`	`+ x: -5.5d,`
	`3`	`+ y: 14.5d,`
`4`	`4`	`dependencies: [`
`5`	`5`	`"62e01842",`
`6`	`6`	`"81bde4ee"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- x: -0.5d,`
	`2`	`+ x: -1.0d,`
`3`	`3`	`y: 17.5d,`
`4`	`4`	`dependencies: [`
`5`	`5`	`"2301e937",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- x: -1.5d,`
	`2`	`+ x: -2.5d,`
`3`	`3`	`y: 17.5d,`
`4`	`4`	`dependencies: [`
`5`	`5`	`"c92d4307"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- x: -3.5d,`
`3`		`- y: 18.5d,`
	`2`	`+ x: -5.5d,`
	`3`	`+ y: 19.0d,`
`4`	`4`	`dependencies: [`
`5`	`5`	`"adf3c2eb",`
`6`	`6`	`"c92d4307"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- x: -3.5d,`
`3`		`- y: 16.5d,`
	`2`	`+ x: -5.5d,`
	`3`	`+ y: 16.0d,`
`4`	`4`	`dependencies: [`
`5`	`5`	`"05629ac2",`
`6`	`6`	`"81bde4ee"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- x: -4.5d,`
	`2`	`+ x: -7.0d,`
`3`	`3`	`y: 17.5d,`
`4`	`4`	`text: [`
`5`	`5`	`"{9881d108.ia.1a2ba52e}"`