update

2023-03-14 21:03:51 -07:00
parent ac93e323d2
commit 2a6cdb591d
2543 changed files with 171586 additions and 2726 deletions
@@ -1,6 +1,6 @@
 {
-	x: 14.0d,
-	y: 0.5d,
+	x: 20.0d,
+	y: -2.0d,
 	text: [
 		"Smart cables can carry up to 8 channels, and they display how many are being used."
 	],
@@ -1,5 +1,5 @@
 {
-	x: 9.0d,
+	x: 11.0d,
 	y: -6.0d,
 	dependencies: [
 		"19b2103c"
@@ -1,6 +1,6 @@
 {
-	x: 12.0d,
-	y: -0.5d,
+	x: 18.0d,
+	y: -3.0d,
 	text: [
 		"ME storage busses use one channel to connect to an inventory. Any items contained in the inventory will become part of the network."
 	],
@@ -1,6 +1,6 @@
 {
-	x: 12.0d,
-	y: -2.5d,
+	x: 16.0d,
+	y: -7.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 17.0d,
-	y: -4.5d,
+	x: 19.0d,
+	y: -7.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -0,0 +1,14 @@
+{
+	x: 10.0d,
+	y: -6.0d,
+	dependencies: [
+		"e6bea472"
+	],
+	tasks: [{
+		uid: "f4868a86",
+		type: "item",
+		items: [{
+			item: "fluxnetworks:fluxcontroller"
+		}]
+	}]
+}
@@ -1,6 +1,6 @@
 {
-	x: 17.0d,
-	y: -0.5d,
+	x: 21.0d,
+	y: -3.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,5 +1,5 @@
 {
-	x: 9.0d,
+	x: 11.0d,
 	y: -9.0d,
 	dependencies: [
 		"19b2103c"
@@ -1,5 +1,5 @@
 {
-	x: 9.0d,
+	x: 11.0d,
 	y: -5.0d,
 	dependencies: [
 		"3f5fff5f"
@@ -1,6 +1,6 @@
 {
 	x: 12.0d,
-	y: -5.5d,
+	y: -7.0d,
 	dependencies: [
 		"279d7e23"
 	],
@@ -1,5 +1,5 @@
 {
-	x: 9.0d,
+	x: 11.0d,
 	y: -10.0d,
 	dependencies: [
 		"19b2103c"
@@ -1,7 +1,7 @@
 {
 	title: "Xnet",
-	x: 10.0d,
-	y: -4.5d,
+	x: 13.0d,
+	y: -5.0d,
 	dependencies: [
 		"3f5fff5f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 14.0d,
-	y: 2.5d,
+	x: 20.0d,
+	y: 0.0d,
 	dependencies: [
 		"381a4121"
 	],
@@ -9,6 +9,7 @@
 		type: "item",
 		items: [{
 			item: "appliedenergistics2:creative_energy_cell"
-		}]
+		}],
+		ignore_nbt: 1b
 	}]
 }
@@ -1,6 +1,6 @@
 {
-	x: 14.0d,
-	y: -2.5d,
+	x: 16.0d,
+	y: -5.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: -5.5d,
+	x: 18.0d,
+	y: -9.0d,
 	dependencies: [
 		"8da6d2ea"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: -2.5d,
+	x: 18.0d,
+	y: -6.0d,
 	dependencies: [
 		"d110f5ad"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 13.0d,
-	y: -1.5d,
+	x: 15.0d,
+	y: -4.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: 5.5d,
+	x: 21.0d,
+	y: 3.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: -4.5d,
+	x: 20.0d,
+	y: -7.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: 3.5d,
+	x: 21.0d,
+	y: 1.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 13.0d,
-	y: 2.5d,
+	x: 19.0d,
+	y: 0.0d,
 	dependencies: [
 		"e72b62a2"
 	],
@@ -10,6 +10,7 @@
 		items: [{
 			id: "appliedenergistics2:dense_energy_cell",
 			tag: {}
-		}]
+		}],
+		ignore_nbt: 1b
 	}]
 }
@@ -1,6 +1,6 @@
 {
-	x: 13.0d,
-	y: -6.5d,
+	x: 14.0d,
+	y: -8.0d,
 	dependencies: [
 		"279d7e23"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 17.0d,
-	y: 0.5d,
+	x: 23.0d,
+	y: -2.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 13.0d,
-	y: -5.5d,
+	x: 14.0d,
+	y: -7.0d,
 	dependencies: [
 		"279d7e23"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -6.5d,
+	x: 22.0d,
+	y: -9.0d,
 	dependencies: [
 		"dbac367c"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -2.5d,
+	x: 22.0d,
+	y: -5.0d,
 	dependencies: [
 		"a2e193e6"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 13.0d,
-	y: 0.5d,
+	x: 19.0d,
+	y: -2.0d,
 	text: [
 		"ME glass cables are the simplest way to transfer channels to make a AE2 network. They can carry up to 8 channels, but they do not display how many are currently used."
 	],
@@ -1,5 +1,5 @@
 {
-	x: 9.0d,
+	x: 11.0d,
 	y: -8.0d,
 	dependencies: [
 		"19b2103c"
@@ -1,6 +1,6 @@
 {
-	x: 13.0d,
-	y: -2.5d,
+	x: 16.0d,
+	y: -6.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: -0.5d,
+	x: 20.0d,
+	y: -4.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: 5.5d,
+	x: 22.0d,
+	y: 3.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -0,0 +1,14 @@
+{
+	x: 9.0d,
+	y: -8.0d,
+	dependencies: [
+		"e6bea472"
+	],
+	tasks: [{
+		uid: "380f94e6",
+		type: "item",
+		items: [{
+			item: "enderio:block_wired_charger"
+		}]
+	}]
+}
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: -7.5d,
+	x: 18.0d,
+	y: -11.0d,
 	dependencies: [
 		"f54a7b0b"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 10.0d,
-	y: 0.5d,
+	x: 16.0d,
+	y: -2.0d,
 	dependencies: [
 		"3f5fff5f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 11.0d,
-	y: -0.5d,
+	x: 17.0d,
+	y: -3.0d,
 	text: [
 		"The level emitter can be configured to output a signal whenever the quantity of a given item is above or below a threshold",
 		"Crafting cards can be added to make the level emitter produce a redstone signal whenever an item is being crafted."
@@ -1,7 +1,7 @@
 {
 	icon: "packagedauto:packager",
-	x: 17.0d,
-	y: -1.5d,
+	x: 19.0d,
+	y: -5.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -0,0 +1,14 @@
+{
+	x: 9.0d,
+	y: -6.0d,
+	dependencies: [
+		"e6bea472"
+	],
+	tasks: [{
+		uid: "bf586ffa",
+		type: "item",
+		items: [{
+			item: "appliedenergistics2:charger"
+		}]
+	}]
+}
@@ -1,6 +1,6 @@
 {
-	x: 18.0d,
-	y: 0.5d,
+	x: 24.0d,
+	y: -2.0d,
 	dependencies: [
 		"3c6a137d"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -7.5d,
+	x: 22.0d,
+	y: -10.0d,
 	dependencies: [
 		"44f880d0"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 17.0d,
-	y: -6.5d,
+	x: 19.0d,
+	y: -9.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -4.5d,
+	x: 22.0d,
+	y: -7.0d,
 	dependencies: [
 		"a2e193e6"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: 1.5d,
+	x: 21.0d,
+	y: -1.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 17.0d,
-	y: -3.5d,
+	x: 21.0d,
+	y: -6.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: 4.5d,
+	x: 22.0d,
+	y: 2.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: 0.5d,
+	x: 22.0d,
+	y: -2.0d,
 	text: [
 		"Dense cables carry up to 32 channels, and they display how many are in use."
 	],
@@ -1,6 +1,6 @@
 {
-	x: 17.0d,
-	y: 2.5d,
+	x: 23.0d,
+	y: 0.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: -3.5d,
+	x: 20.0d,
+	y: -6.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: -2.5d,
+	x: 20.0d,
+	y: -5.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 11.0d,
-	y: -4.5d,
+	x: 13.0d,
+	y: -6.0d,
 	dependencies: [
 		"279d7e23"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: -4.5d,
+	x: 18.0d,
+	y: -8.0d,
 	dependencies: [
 		"e14db201"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 17.0d,
-	y: -5.5d,
+	x: 19.0d,
+	y: -8.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 12.0d,
-	y: -1.5d,
+	x: 15.0d,
+	y: -5.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 12.0d,
-	y: 1.5d,
+	x: 18.0d,
+	y: -1.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
 	x: 13.0d,
-	y: -4.5d,
+	y: -7.0d,
 	dependencies: [
 		"279d7e23"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -0.5d,
+	x: 22.0d,
+	y: -3.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -3.5d,
+	x: 22.0d,
+	y: -6.0d,
 	dependencies: [
 		"a2e193e6"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: -1.5d,
+	x: 19.0d,
+	y: -4.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 11.0d,
-	y: 1.5d,
+	x: 17.0d,
+	y: -1.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -21,7 +21,8 @@
 			},
 			ForgeCaps: {
 				"astralsorcery:cap_item_amulet_holder": {}
-			}
+			},
+			Count: 1b
 		}],
 		ignore_damage: true,
 		ignore_nbt: 1b
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -1.5d,
+	x: 22.0d,
+	y: -4.0d,
 	dependencies: [
 		"a2e193e6"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 12.0d,
-	y: -4.5d,
+	x: 14.0d,
+	y: -6.0d,
 	dependencies: [
 		"279d7e23"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 14.0d,
-	y: 1.5d,
+	x: 20.0d,
+	y: -1.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: 1.5d,
+	x: 22.0d,
+	y: -1.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 11.0d,
-	y: -1.5d,
+	x: 17.0d,
+	y: -4.0d,
 	text: [
 		"Toggle busses can be used to connect or disconnect a section of a AE2 network using redstone."
 	],
@@ -1,6 +1,6 @@
 {
-	x: 13.0d,
-	y: -0.5d,
+	x: 19.0d,
+	y: -3.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -0,0 +1,29 @@
+{
+	x: 9.0d,
+	y: -7.0d,
+	dependencies: [
+		"e6bea472"
+	],
+	tasks: [{
+		uid: "e3e42539",
+		type: "item",
+		items: [{
+			id: "thermalexpansion:machine",
+			Damage: 9s,
+			tag: {
+				Facing: 3b,
+				SideCache: [B;
+					1b,
+					1b,
+					2b,
+					2b,
+					2b,
+					2b
+				],
+				RSControl: 0b,
+				Energy: 0,
+				Level: 0b
+			}
+		}]
+	}]
+}
@@ -1,6 +1,6 @@
 {
-	x: 13.0d,
-	y: 1.5d,
+	x: 19.0d,
+	y: -1.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: -1.5d,
+	x: 18.0d,
+	y: -5.0d,
 	dependencies: [
 		"d110f5ad"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 12.0d,
-	y: 0.5d,
+	x: 18.0d,
+	y: -2.0d,
 	text: [
 		"The ME controller is the heart of every AE2 system.",
 		"Each controller can output 8 (basic) to 32 (dense) channels from each side, depending on the tipe of ME cable used.",
@@ -1,5 +1,5 @@
 {
-	x: 9.0d,
+	x: 11.0d,
 	y: -7.0d,
 	dependencies: [
 		"19b2103c"
@@ -1,6 +1,6 @@
 {
-	x: 11.0d,
-	y: -5.5d,
+	x: 12.0d,
+	y: -6.0d,
 	dependencies: [
 		"279d7e23"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: 0.5d,
+	x: 21.0d,
+	y: -2.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: 2.5d,
+	x: 21.0d,
+	y: 0.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 14.0d,
-	y: -3.5d,
+	x: 15.0d,
+	y: -6.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: 4.5d,
+	x: 21.0d,
+	y: 2.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -8.5d,
+	x: 22.0d,
+	y: -11.0d,
 	dependencies: [
 		"6708a578"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: 3.5d,
+	x: 22.0d,
+	y: 1.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 19.0d,
-	y: -5.5d,
+	x: 22.0d,
+	y: -8.0d,
 	dependencies: [
 		"6e69ee75"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: -0.5d,
+	x: 18.0d,
+	y: -4.0d,
 	dependencies: [
 		"d110f5ad"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: -3.5d,
+	x: 18.0d,
+	y: -7.0d,
 	dependencies: [
 		"d110f5ad"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 16.0d,
-	y: 2.5d,
+	x: 22.0d,
+	y: 0.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 11.0d,
-	y: 0.5d,
+	x: 17.0d,
+	y: -2.0d,
 	text: [
 		"The energy acceptor is used to input energy into a basic (8 channels) AE2 network. For larger numbers of channels, the ME controller should be used."
 	],
@@ -1,6 +1,6 @@
 {
-	x: 14.0d,
-	y: -0.5d,
+	x: 20.0d,
+	y: -3.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 14.0d,
-	y: -1.5d,
+	x: 16.0d,
+	y: -4.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -0,0 +1,12 @@
+{
+	x: 9.0d,
+	y: -5.0d,
+	dependencies: [
+		"3f5fff5f"
+	],
+	tasks: [{
+		uid: "94539b67",
+		type: "checkmark",
+		title: "Chargers"
+	}]
+}
@@ -1,6 +1,6 @@
 {
-	x: 12.0d,
-	y: 2.5d,
+	x: 18.0d,
+	y: 0.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -10,6 +10,7 @@
 		items: [{
 			id: "appliedenergistics2:energy_cell",
 			tag: {}
-		}]
+		}],
+		ignore_nbt: 1b
 	}]
 }
@@ -1,6 +1,6 @@
 {
-	x: 17.0d,
-	y: -2.5d,
+	x: 19.0d,
+	y: -6.0d,
 	dependencies: [
 		"c886443f"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 20.0d,
-	y: -1.5d,
+	x: 23.0d,
+	y: -4.0d,
 	dependencies: [
 		"adb65dd2"
 	],
@@ -1,6 +1,6 @@
 {
-	x: 15.0d,
-	y: -6.5d,
+	x: 18.0d,
+	y: -10.0d,
 	dependencies: [
 		"2b7cd439"
 	],