Skip to content

Commit b0216c3

Browse files
htmlcsjshtmlcsjs
authored
Update GT to 7.2.0 (#141)
1 parent 08607f5 commit b0216c3

File tree

10 files changed

+55
-55
lines changed

10 files changed

+55
-55
lines changed

‎config/ftbquests/quests/chapters/gtceu.snbt‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
id: "gtceu:iron_wrench"
99
tag: {
1010
Damage: 0
11-
GT.Tool: {
12-
Damage: 0
13-
}
11+
GT.Tool: { }
1412
}
1513
}
1614
id: "2F8B0AFE317363C9"
@@ -187,9 +185,7 @@
187185
id: "gtceu:steel_axe"
188186
tag: {
189187
Damage: 0
190-
GT.Tool: {
191-
Damage: 0
192-
}
188+
GT.Tool: { }
193189
}
194190
}
195191
id: "13354F24F80F65FB"
@@ -743,9 +739,7 @@
743739
id: "gtceu:steel_hammer"
744740
tag: {
745741
Damage: 0
746-
GT.Tool: {
747-
Damage: 0
748-
}
742+
GT.Tool: { }
749743
}
750744
}
751745
id: "1A4DDB914D7D2F3C"
@@ -781,9 +775,7 @@
781775
id: "gtceu:steel_mining_hammer"
782776
tag: {
783777
Damage: 0
784-
GT.Tool: {
785-
Damage: 0
786-
}
778+
GT.Tool: { }
787779
}
788780
}
789781
id: "4A365A7CC9E374F9"
@@ -796,9 +788,7 @@
796788
id: "gtceu:steel_mining_hammer"
797789
tag: {
798790
Damage: 0
799-
GT.Tool: {
800-
Damage: 0
801-
}
791+
GT.Tool: { }
802792
}
803793
}
804794
id: "4F372C393ADC6CE2"
@@ -908,9 +898,7 @@
908898
id: "gtceu:iron_wrench"
909899
tag: {
910900
Damage: 0
911-
GT.Tool: {
912-
Damage: 0
913-
}
901+
GT.Tool: { }
914902
}
915903
}
916904
id: "2001CB4968D3E0A2"
@@ -990,9 +978,7 @@
990978
id: "gtceu:iron_screwdriver"
991979
tag: {
992980
Damage: 0
993-
GT.Tool: {
994-
Damage: 0
995-
}
981+
GT.Tool: { }
996982
}
997983
}
998984
id: "5C3501DD3B4788FA"
@@ -1329,9 +1315,7 @@
13291315
id: "gtceu:iron_shovel"
13301316
tag: {
13311317
Damage: 0
1332-
GT.Tool: {
1333-
Damage: 0
1334-
}
1318+
GT.Tool: { }
13351319
}
13361320
}
13371321
type: "item"
@@ -1342,13 +1326,13 @@
13421326
Count: 1
13431327
id: "gtceu:iron_axe"
13441328
tag: {
1329+
Damage: 0
13451330
DisallowContainerItem: 0b
13461331
GT.Behaviours: {
13471332
DisableShields: 1b
13481333
TreeFelling: 1b
13491334
}
13501335
GT.Tool: {
1351-
Damage: 0
13521336
HarvestLevel: 2
13531337
MaxDamage: 255
13541338
ToolSpeed: 4.0f

‎config/ftbquests/quests/chapters/hv__high_voltage.snbt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,8 @@
461461
"Visiting &dThe End&r allows you to access a richer Bauxite vein, as well as &9Ilmenite&r - an even better source of Rutile."
462462
""
463463
"&9Tip:&r Ore processing for &aBauxite&r is ridiculously good! Including the &3Thermal Centrifuge&r step easily &6triples&r your &aRutile&r yield."
464+
""
465+
"&9Bonus Tip:&r There is also an alternate route you can process &aPurified Bauxite&r in a &3Mixer&r and process into a greater return of &aRutile&r, however this is much harder to initally batch so it is more ideal to use when you set up a dedicated Titanium processing line."
464466
]
465467
icon: "gtceu:rutile_dust"
466468
id: "59DFC4DA7D29C315"

‎config/ftbquests/quests/chapters/iv__insane_voltage.snbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,10 +1091,10 @@
10911091
Count: 1
10921092
id: "gtceu:polybenzimidazole_mallet"
10931093
tag: {
1094+
Damage: 0
10941095
DisallowContainerItem: 0b
10951096
GT.Behaviours: { }
10961097
GT.Tool: {
1097-
Damage: 0
10981098
MaxDamage: 1023
10991099
}
11001100
HideFlags: 2
@@ -1110,10 +1110,10 @@
11101110
Count: 1
11111111
id: "gtceu:polybenzimidazole_mallet"
11121112
tag: {
1113+
Damage: 0
11131114
DisallowContainerItem: 0b
11141115
GT.Behaviours: { }
11151116
GT.Tool: {
1116-
Damage: 0
11171117
MaxDamage: 1023
11181118
}
11191119
HideFlags: 2

‎config/ftbquests/quests/chapters/lv__low_voltage.snbt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,6 +2258,7 @@
22582258
id: "gtceu:lv_iron_drill"
22592259
tag: {
22602260
Charge: 2147483647L
2261+
Damage: 0
22612262
DisallowContainerItem: 0b
22622263
GT.Behaviours: {
22632264
AoEColumn: 1
@@ -2268,7 +2269,6 @@
22682269
MaxAoERow: 1
22692270
}
22702271
GT.Tool: {
2271-
Damage: 0
22722272
HarvestLevel: 2
22732273
MaxDamage: 767
22742274
ToolSpeed: 6.0f
@@ -2289,6 +2289,7 @@
22892289
id: "gtceu:lv_iron_drill"
22902290
tag: {
22912291
Charge: 2147483647L
2292+
Damage: 0
22922293
DisallowContainerItem: 0b
22932294
GT.Behaviours: {
22942295
AoEColumn: 1
@@ -2299,7 +2300,6 @@
22992300
MaxAoERow: 1
23002301
}
23012302
GT.Tool: {
2302-
Damage: 0
23032303
HarvestLevel: 2
23042304
MaxDamage: 767
23052305
ToolSpeed: 6.0f
@@ -2431,10 +2431,10 @@
24312431
Count: 1
24322432
id: "gtceu:polybenzimidazole_mallet"
24332433
tag: {
2434+
Damage: 0
24342435
DisallowContainerItem: 0b
24352436
GT.Behaviours: { }
24362437
GT.Tool: {
2437-
Damage: 0
24382438
MaxDamage: 1023
24392439
}
24402440
HideFlags: 2

‎config/ftbquests/quests/chapters/steam_age.snbt‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,7 @@
299299
id: "gtceu:red_steel_pickaxe"
300300
tag: {
301301
Damage: 0
302-
GT.Tool: {
303-
Damage: 0
304-
}
302+
GT.Tool: { }
305303
}
306304
}
307305
type: "item"
@@ -496,7 +494,7 @@
496494
"{@pagebreak}"
497495
"The &cOutput Hatch&r is where water will be generated. You can make it face up or down to auto-output water into your pipes, which can go &ethrough&r the Treated Wood Frames - just place the pipe before you encase it in the frames. "
498496
""
499-
"When you reach &7LV&r or &bMV&r, you can use an Output Hatch from either tier to further boost the Pump's output."
497+
"Later you can use a &8ULV&r or &7LV&r Output Hatch to further boost the Pump's output."
500498
""
501499
"&2Reminder:&r Use a Wrench to rotate GregTech blocks (sneak right-click)."
502500
""
@@ -1141,6 +1139,7 @@
11411139
Count: 1
11421140
id: "gtceu:invar_mining_hammer"
11431141
tag: {
1142+
Damage: 0
11441143
DisallowContainerItem: 0b
11451144
Enchantments: [{
11461145
id: "minecraft:efficiency"
@@ -1155,7 +1154,6 @@
11551154
MaxAoERow: 1
11561155
}
11571156
GT.Tool: {
1158-
Damage: 0
11591157
HarvestLevel: 2
11601158
MaxDamage: 1151
11611159
ToolSpeed: 5.6f
@@ -1619,9 +1617,11 @@
16191617
""
16201618
"The &3Wooden Multiblock Tank&r&r holds &a250,000 mB&r, but you won't be able to use it to store &chot Fluids&r such as Lava, or &cGases&r such as Steam or Oxygen."
16211619
""
1622-
"The &3Steel Multiblock Tank&r holds &a1,000,000 mB&r, and lifts the aforementioned fluid restrictions."
1620+
"The &3Bronze Multiblock Tank&r holds &a500,000 mB&r, lifiting the maximum fluid tempreture and can now store &cGases&r. "
16231621
""
1624-
"Get &eany&r of the Tanks to complete this quest. The Steel version is &dway too expensive&r right now - so you should probably make the Wooden one instead."
1622+
"The &3Steel Multiblock Tank&r holds &a1,000,000 mB&r, and lifts all the aforementioned fluid restrictions."
1623+
""
1624+
"Get &eany&r of the Tanks to complete this quest. The Steel version is &dway too expensive&r right now - so you should probably make the Wooden or Bronze one instead."
16251625
"{@pagebreak}"
16261626
"Fluid transfer can either be facilitated through the Controller block, or through up to &atwo Valves&r."
16271627
""
@@ -1665,6 +1665,10 @@
16651665
}
16661666
{
16671667
Count: 1b
1668+
id: "gtceu:bronze_multiblock_tank"
1669+
}
1670+
{
1671+
Count: 1
16681672
id: "gtceu:steel_multiblock_tank"
16691673
}
16701674
]
@@ -1684,6 +1688,10 @@
16841688
Count: 1b
16851689
id: "gtceu:wooden_tank_valve"
16861690
}
1691+
{
1692+
Count: 1b
1693+
id: "gtceu:bronze_tank_valve"
1694+
}
16871695
{
16881696
Count: 1b
16891697
id: "gtceu:steel_tank_valve"
@@ -1706,6 +1714,10 @@
17061714
Count: 1b
17071715
id: "gtceu:solid_machine_casing"
17081716
}
1717+
{
1718+
Count: 1b
1719+
id: "gtceu:steam_machine_casing"
1720+
}
17091721
{
17101722
Count: 1b
17111723
id: "gtceu:wood_wall"

‎config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@
6161
id: "gtceu:iron_wrench"
6262
tag: {
6363
Damage: 0
64-
GT.Tool: {
65-
Damage: 0
66-
}
64+
GT.Tool: { }
6765
}
6866
}
6967
id: "6E8F257261F93501"

‎index.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,27 +122,27 @@ hash = "07fe5025de4ecd299a214260c8d6df1a9dd8094a7bf7a7362e59f4027270d3b0"
122122

123123
[[files]]
124124
file = "config/ftbquests/quests/chapters/gtceu.snbt"
125-
hash = "cecf5d83950dfd7d9943dfa54deac0545ced65b165b6819a405c02f13d40de80"
125+
hash = "8328695fce4ed23b94fa2e54e431e59ede189e4a9ed1f76b9e6eec24639b7e8b"
126126

127127
[[files]]
128128
file = "config/ftbquests/quests/chapters/heating_coils.snbt"
129129
hash = "3de3b8987fbd6652079f9a6f8ff7f0d140753eb94563b31554648a09990d89e1"
130130

131131
[[files]]
132132
file = "config/ftbquests/quests/chapters/hv__high_voltage.snbt"
133-
hash = "3e4ed0a11278da6cd1a4056b45370df93ed53c5525500a7b26743948bae3e5c7"
133+
hash = "c7509bc06ae4bc0a5667610206be7cc8d2c9db244543adeba6b9a3f45c7f09eb"
134134

135135
[[files]]
136136
file = "config/ftbquests/quests/chapters/iv__insane_voltage.snbt"
137-
hash = "dd54590b939ae9dc5d053f794eac6d727d84b70bac05f90a3c8c4f2d2b7bae7a"
137+
hash = "47e9a9124100e3e5d67af25dd1c2fa07a852a80f50d62d61588050960a2dd2fa"
138138

139139
[[files]]
140140
file = "config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt"
141141
hash = "b68e2e3c85c5f70f5f1938e31ec228684cc08e823bca4e4170fb92e9339b2670"
142142

143143
[[files]]
144144
file = "config/ftbquests/quests/chapters/lv__low_voltage.snbt"
145-
hash = "2b7d8c6d348728a194348d6ec35da2c8775ec23776688e6b90e72a36c2a48fb5"
145+
hash = "30fd5fb575e5a138f51de82459c5aa32708697d36a4690d4ed33f89ab6a4673f"
146146

147147
[[files]]
148148
file = "config/ftbquests/quests/chapters/multiblock_dilemma.snbt"
@@ -170,15 +170,15 @@ hash = "070e4c59640dc3014745eb4f2b83f918342a92c7dbec9a44c7e003500de90904"
170170

171171
[[files]]
172172
file = "config/ftbquests/quests/chapters/steam_age.snbt"
173-
hash = "7dfdebf57e389951e58ece3928f1e3826e1ded6e3e51da86edbd865d96994e26"
173+
hash = "15f51039f3f8e730257b352a4ec337fb292c3e2a0213a049f90d4d485e6f4434"
174174

175175
[[files]]
176176
file = "config/ftbquests/quests/chapters/tips_and_tricks_2.snbt"
177177
hash = "171dd9f3683bd2a82752e7cba96c8a4e44f5370e7ba1a819838eb5be7a652e0a"
178178

179179
[[files]]
180180
file = "config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt"
181-
hash = "9cc17a62f1d3504f9b0c2b923ef0130981a258900c52b743ac64b14c43e64162"
181+
hash = "29cbbea672860c7c190eecdcfe8d9b183017a1c68b517b84c02675c0f8380f30"
182182

183183
[[files]]
184184
file = "config/ftbquests/quests/chapters/zpm__zero_point_module.snbt"
@@ -394,7 +394,7 @@ hash = "1dcee38470c2939f7265891203775b7631c81822bf2506a451727fcaaf2cc4a2"
394394

395395
[[files]]
396396
file = "config/xaerominimap.txt"
397-
hash = "59e679328251ff4aa7f0520a83e1d2d324e6119ce865fcb5146af03666fb9216"
397+
hash = "633cb4a20c7ac18b6cbab3010650c7b100f20f92b20469e223815fd5ca82310e"
398398

399399
[[files]]
400400
file = "config/xaerominimap_entities.json"
@@ -410,7 +410,7 @@ hash = "103979a8e59e396f99fb8646c4f8a690c2d743ca3744a2eb8f663b3102b7498c"
410410

411411
[[files]]
412412
file = "config/xaeroworldmap.txt"
413-
hash = "5f5bdca3065e80bb07e21c346365c5b05fb999a938d4bee8cd3f227184f73afb"
413+
hash = "0032589daad191eafe1a1da6476f1e3cd4c4f8381a306227e5247837cb466dc8"
414414

415415
[[files]]
416416
file = "defaultconfigs/ftbchunks/client-config.snbt"
@@ -578,7 +578,7 @@ hash = "e68a97b24aa63aa8290b9891b02af7499ccd7f9a1dc2ef2cc3d183d660c48177"
578578

579579
[[files]]
580580
file = "kubejs/server_scripts/appliedenergistics2/extendedae2.js"
581-
hash = "bee90f3cad28ab6d5c15a80b6ed1400a1969a0088b045c72ee2d923f794668f3"
581+
hash = "17e494a87f0b9d1b242a90f75fa3ae8903db2c76a87ab1a9152394ec3798f766"
582582

583583
[[files]]
584584
file = "kubejs/server_scripts/appliedenergistics2/inscriber.js"
@@ -966,7 +966,7 @@ metafile = true
966966

967967
[[files]]
968968
file = "mods/gregtechceu-modern.pw.toml"
969-
hash = "f76dcc4122bcbc77ce67812b83013c7728c84c26b24321ab4ce2e650eb1688f4"
969+
hash = "405441ee4b2caa3503f94720d00f9d86d804ab5cba09fb65f13cee4be11c3e39"
970970
metafile = true
971971

972972
[[files]]

‎kubejs/server_scripts/appliedenergistics2/extendedae2.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ServerEvents.recipes((event) => {
1010
"gtceu:soc",
1111
"#gtceu:circuits/hv"
1212
)
13+
.circuit(1)
1314
.itemOutputs("expatternprovider:ex_pattern_provider")
1415
.duration(200)
1516
.EUt(50);
@@ -22,11 +23,12 @@ ServerEvents.recipes((event) => {
2223
"gtceu:soc",
2324
"#gtceu:circuits/hv"
2425
)
26+
.circuit(1)
2527
.itemOutputs("expatternprovider:ex_interface")
2628
.duration(200)
2729
.EUt(50);
2830

29-
// extended thermal upgrade shit
31+
// extended upgrades (like thermal)
3032
event.remove({ id: "expatternprovider:epp_upgrade" });
3133
greg
3234
.assembler("extended_pattern_provider_upgrade")
@@ -35,13 +37,15 @@ ServerEvents.recipes((event) => {
3537
"gtceu:soc",
3638
"#gtceu:circuits/hv"
3739
)
40+
.circuit(2)
3841
.itemOutputs("expatternprovider:pattern_provider_upgrade")
3942
.duration(180)
4043
.EUt(50);
4144
event.remove({ id: "expatternprovider:ei_upgrade" });
4245
greg
4346
.assembler("extended_interface_upgrade")
4447
.itemInputs("4x ae2:logic_processor", "gtceu:soc", "#gtceu:circuits/hv")
48+
.circuit(2)
4549
.itemOutputs("expatternprovider:interface_upgrade")
4650
.duration(180)
4751
.EUt(50);

0 commit comments

Comments
 (0)