Skip to content

Commit 7099f38

Browse files
htmlcsjsursamina
htmlcsjs
and
ursamina
authored
Update GT and other mods (#119)
* Update mods: Had Enough Items 4.25.1 -> 4.25.4 Controlling 3.0.12.2 -> 3.0.12.3 Xaero's Minimap 23.9.1 -> 24.1.1 Xaero's World Map 1.37.1 -> 1.38.4 Better Questing Unofficial 4.1.0 -> 4.2.2 CensoredASM 5.18 -> 5.20 LittleTiles 1.5.85 -> 1.5.87 GregTech CE Unofficial 2.8.7-beta -> 2.8.8-beta AE2 Unofficial Extended Life v0.56.3 -> v0.56.4 AE2 Fluid Crafting Rework AE2-2.5.6-r -> AE2-2.5.13-r Sledgehammer 2.0.25 -> 2.0.26 Universal Tweaks 1.9.0 -> 1.11.0 GroovyScript 0.7.3 -> 1.0.1 ConfigAnytime 1.0 -> 3.0 VisualOres 0.2.4 -> 0.2.5 Inventory Bogo Sorter 1.4.6 -> 1.4.8 ModularUI 2.4.2 -> 2.4.3 Neeve's AE2: Extended Life Additions 1.6.1 -> 1.6.2 * Update AE2 mods: Neeve's AE2: Extended Life Additions 1.6.2 -> 1.6.4 AE2 Unofficial Extended Life v0.56.4 -> 0.56.5 * add recipes for new stuff added by NAE2 * oops (fix missing package in globals) * add NAE2 quests (#121) * Update Mods: Had Enough Items 4.25.4 -> 4.25.5 Controlling 3.0.12.3 -> 3.0.12.4 Xaero's Minimap 24.1.1 -> 24.2.0 Xaero's World Map 1.38.4 -> 1.38.8 GregTech CE Unofficial 2.8.8 -> 2.8.10 AE2 Unofficial Extended Life 0.56.5 -> 0.56.6 AE2 Fluid Crafting Rework 2.5.13-r -> 2.6.4-r Universal Tweaks 1.11.0 -> 1.12.0 Particle Culling v1.4.1 -> v1.4.3 GroovyScript 1.0.1 -> 1.1.1 Gregicality Multiblocks 1.2.8 -> 1.2.10 MixinBooter 8.8 -> 8.9 * Update GrS to 1.1.2 * Downgrade AE and addons due to blocking bugs AE2UEL: 0.56.4 AE2FCr: 2.5.13-r * NAE2 recipe rebalances * Update new quest requirements --------- Co-authored-by: mina <[email protected]>
1 parent 5d9840c commit 7099f38

File tree

8 files changed

+805
-29
lines changed

8 files changed

+805
-29
lines changed

‎config/betterquesting/DefaultQuests.json‎

100755100644
Lines changed: 745 additions & 0 deletions
Large diffs are not rendered by default.

‎groovy/classes/MetaTileEntityGreenhouse.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package classes
2+
13
import gregtech.api.metatileentity.MetaTileEntity
24
import gregtech.api.metatileentity.interfaces.IGregTechTileEntity
35
import gregtech.api.metatileentity.multiblock.IMultiblockPart

‎groovy/classes/globals.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package classes
2+
13
public class globals {
24
public static final DYES = [
35
'white',
@@ -17,4 +19,4 @@ public class globals {
1719
'red',
1820
'black'
1921
]
20-
}
22+
}

‎groovy/postInit/ae2_fc.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ crafting.shapedBuilder().name('fluid_discretizer')
1414
.register()
1515

1616
// Fluid Pattern Encoder
17-
mods.jei.hide(item('ae2fc:fluid_pattern_encoder'))
17+
mods.jei.ingredient.hide(item('ae2fc:fluid_pattern_encoder'))
1818
crafting.remove('ae2fc:fluid_pattern_encoder')
1919

2020
// Fluid Packet Decoder
@@ -32,11 +32,11 @@ crafting.shapedBuilder().name('fluid_packet_decoder')
3232
.register()
3333

3434
// Ingredient Buffer
35-
mods.jei.hide(item('ae2fc:ingredient_buffer'))
35+
mods.jei.ingredient.hide(item('ae2fc:ingredient_buffer'))
3636
crafting.remove('ae2fc:ingredient_buffer')
3737

3838
// Large Ingredient Buffer
39-
mods.jei.hide(item('ae2fc:large_ingredient_buffer'))
39+
mods.jei.ingredient.hide(item('ae2fc:large_ingredient_buffer'))
4040
crafting.remove('ae2fc:large_ingredient_buffer')
4141

4242
// Precision Burette
@@ -62,7 +62,7 @@ crafting.shapedBuilder().name('dual_interface')
6262
.register()
6363

6464
// Fluid Level Maintainer
65-
mods.jei.hide(item('ae2fc:fluid_level_maintainer'))
65+
mods.jei.ingredient.hide(item('ae2fc:fluid_level_maintainer'))
6666
crafting.remove('ae2fc:fluid_level_maintainer')
6767

6868
// Fluid Assembler

‎groovy/postInit/jei.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Hide categories
2-
mods.jei.hideCategory('appliedenergistics2.grinder')
3-
mods.jei.hideCategory('appliedenergistics2.inscriber')
2+
mods.jei.category.remove('appliedenergistics2.grinder')
3+
mods.jei.category.remove('appliedenergistics2.inscriber')

‎groovy/postInit/nae2.groovy‎

100644100755
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,23 @@ crafting.shapedBuilder().name('hyper_acceleration_card')
2020
.key('K', ore('circuitIv'))
2121
.register()
2222

23+
// Job Auto-Complete Card
24+
crafting.remove('nae2:item/upgrade/auto_complete')
25+
crafting.shapelessBuilder().name('auto_complete_card')
26+
.output(item('nae2:upgrade', 1))
27+
.input(item('appliedenergistics2:material', 53))
28+
.input(metaitem('emitter.mv'))
29+
.register()
30+
31+
// Programmed Circuit Card
32+
crafting.remove('nae2:item/upgrade/gregtech_circuit')
33+
crafting.shapelessBuilder().name('programmed_circuit_card')
34+
.output(item('nae2:upgrade', 2))
35+
.input(item('appliedenergistics2:material', 28))
36+
.input(metaitem('robot.arm.ev'))
37+
.input(ore('circuitLuv'))
38+
.register()
39+
2340
// Pattern Multi-Tool
2441
crafting.remove('nae2:item/pattern_multiplier')
2542
crafting.shapedBuilder().name('pattern_multitool')
@@ -33,6 +50,16 @@ crafting.shapedBuilder().name('pattern_multitool')
3350
.key('C', item('appliedenergistics2:material', 23))
3451
.register()
3552

53+
// ME Storage Exposer
54+
crafting.remove('nae2:block/exposer')
55+
recipemap('assembler').recipeBuilder()
56+
.inputs(metaitem('hull.ev'))
57+
.inputs(item('appliedenergistics2:interface'))
58+
.inputs(metaitem('sensor.ev'))
59+
.inputs(item('appliedenergistics2:material:30') * 4)
60+
.outputs(item('nae2:exposer'))
61+
.duration(200).EUt(1920).buildAndRegister()
62+
3663
// Void Storage Component
3764
crafting.remove('nae2:item/material/storage/cell_part_void')
3865
crafting.shapedBuilder().name('cell_part_void')

‎groovy/preInit/materials.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ event_manager.listen { MaterialEvent event ->
1010
.gem()
1111
.color(0x674FAF).iconSet('CERTUS')
1212
.flags('generate_plate', 'disable_decomposition', 'no_smelting', 'crystallizable')
13-
.components(material('certus_quartz'), 1, material('nether_quartz'), 1, material('redstone'), 1)
13+
.components(material('certus_quartz'), material('nether_quartz'), material('redstone'))
1414
.build()
1515

1616
material('certus_quartz').addFlags('generate_rod', 'generate_bolt_screw')

‎manifest.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"files": [
1919
{
2020
"projectID": 557549,
21-
"fileID": 4810661,
21+
"fileID": 5471944,
2222
"required": true
2323
},
2424
{
@@ -40,7 +40,7 @@
4040
{
4141
"clientOnly": true,
4242
"projectID": 250398,
43-
"fileID": 4428378,
43+
"fileID": 5408385,
4444
"required": true
4545
},
4646
{
@@ -122,12 +122,12 @@
122122
},
123123
{
124124
"projectID": 263420,
125-
"fileID": 4911777,
125+
"fileID": 5394758,
126126
"required": true
127127
},
128128
{
129129
"projectID": 317780,
130-
"fileID": 4911823,
130+
"fileID": 5394803,
131131
"required": true
132132
},
133133
{
@@ -230,7 +230,7 @@
230230
},
231231
{
232232
"projectID": 629629,
233-
"fileID": 4010084,
233+
"fileID": 5183601,
234234
"required": true
235235
},
236236
{
@@ -255,7 +255,7 @@
255255
},
256256
{
257257
"projectID": 460609,
258-
"fileID": 4800875,
258+
"fileID": 5257348,
259259
"required": true
260260
},
261261
{
@@ -276,7 +276,7 @@
276276
},
277277
{
278278
"projectID": 419286,
279-
"fileID": 4828995,
279+
"fileID": 4835295,
280280
"required": true
281281
},
282282
{
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"projectID": 257818,
289-
"fileID": 4916630,
289+
"fileID": 5180387,
290290
"required": true
291291
},
292292
{
@@ -327,7 +327,7 @@
327327
},
328328
{
329329
"projectID": 557242,
330-
"fileID": 5121638,
330+
"fileID": 5519022,
331331
"required": true
332332
},
333333
{
@@ -363,7 +363,7 @@
363363
},
364364
{
365365
"projectID": 570458,
366-
"fileID": 5088803,
366+
"fileID": 5147702,
367367
"required": true
368368
},
369369
{
@@ -383,58 +383,58 @@
383383
},
384384
{
385385
"projectID": 623955,
386-
"fileID": 5069186,
386+
"fileID": 5315135,
387387
"required": true
388388
},
389389
{
390390
"projectID": 319175,
391-
"fileID": 4810570,
391+
"fileID": 5264331,
392392
"required": true
393393
},
394394
{
395395
"projectID": 705000,
396-
"fileID": 4929573,
396+
"fileID": 5529764,
397397
"required": true
398398
},
399399
{
400400
"clientOnly": true,
401401
"projectID": 408853,
402-
"fileID": 4439001,
402+
"fileID": 5337217,
403403
"required": true
404404
},
405405
{
406406
"projectID": 687577,
407-
"fileID": 4991701,
407+
"fileID": 5562296,
408408
"required": true
409409
},
410410
{
411411
"projectID": 870276,
412-
"fileID": 4576653,
412+
"fileID": 5212709,
413413
"required": true
414414
},
415415
{
416416
"projectID": 895539,
417-
"fileID": 4904325,
417+
"fileID": 5121879,
418418
"required": true
419419
},
420420
{
421421
"projectID": 632327,
422-
"fileID": 4951607,
422+
"fileID": 5162169,
423423
"required": true
424424
},
425425
{
426426
"projectID": 624243,
427-
"fileID": 4996326,
427+
"fileID": 5153413,
428428
"required": true
429429
},
430430
{
431431
"projectID": 884359,
432-
"fileID": 4955559,
432+
"fileID": 5380800,
433433
"required": true
434434
},
435435
{
436436
"projectID": 564858,
437-
"fileID": 5121714,
437+
"fileID": 5508050,
438438
"required": true
439439
},
440440
{

0 commit comments

Comments
 (0)