Skip to content

Commit 76d829a

Browse files
LuziferSenpaiLuziferSenpai
authored
Merge branch 'Theta-1-Main' into ModifierTooltip
2 parents c1b496f + 627d550 commit 76d829a

47 files changed

Lines changed: 2865 additions & 2429 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/fancymenu/assets/splash_texts.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The machines go brrrrr
1313
Don't drink the H2SO4
1414
O I I A
1515
The chances of Komaru biting isn't 0
16-
Aquire Komaru => Win Pack
16+
Acquire Komaru => Win Pack
1717
Hope you like Gregtech!
1818
Succumb to the void!
1919
The headache experience with a bit of Minecraft on the side!

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"2C354B0735DF8023"
3939
"3C09E77C352B2A11"
4040
]
41-
description: ["{ftbquests.abydos.runic_casings.description}"]
41+
description: ["{ftbquests.asg.runic_casings.description}"]
4242
id: "379D69A44FC5B2F2"
4343
rewards: [{
4444
id: "06D88EE9C7DC14A5"
@@ -68,7 +68,7 @@
6868
type: "item"
6969
}
7070
]
71-
title: "{ftbquests.abydos.runic_casings.title}"
71+
title: "{ftbquests.asg.runic_casings.title}"
7272
x: 1.0d
7373
y: 5.0d
7474
}
@@ -81,7 +81,7 @@
8181
"25583D0BF59E1BC8"
8282
"7AC55BA8BDD0F3D2"
8383
]
84-
description: ["{ftbquests.abydos.runic_inscribe_manipulate.description}"]
84+
description: ["{ftbquests.asg.runic_inscribe_manipulate.description}"]
8585
id: "2C354B0735DF8023"
8686
rewards: [{
8787
count: 2
@@ -108,7 +108,7 @@
108108
"75F0388FAB52E0B3"
109109
"30C974448C57F0EC"
110110
]
111-
description: ["{ftbquests.abydos.inscribe_casing.description}"]
111+
description: ["{ftbquests.asg.inscribe_casing.description}"]
112112
hide_dependency_lines: true
113113
id: "624480A1E62B52EF"
114114
rewards: [{
@@ -127,7 +127,7 @@
127127
}
128128
{
129129
dependencies: ["2F26A144D29B00A5"]
130-
description: ["{ftbquests.abydos.nether_armor.description}"]
130+
description: ["{ftbquests.asg.nether_armor.description}"]
131131
id: "59B0F5DB2C1E96DC"
132132
rewards: [{
133133
id: "25BD037BA00CCCA2"
@@ -182,13 +182,13 @@
182182
type: "item"
183183
}
184184
]
185-
title: "{ftbquests.abydos.nether_armor.title}"
185+
title: "{ftbquests.asg.nether_armor.title}"
186186
x: -2.5d
187187
y: -6.5d
188188
}
189189
{
190190
dependencies: ["3479CEBD73550718"]
191-
description: ["{ftbquests.abydos.naquadah_armor.description}"]
191+
description: ["{ftbquests.asg.naquadah_armor.description}"]
192192
hide_dependency_lines: true
193193
id: "2F26A144D29B00A5"
194194
rewards: [{
@@ -243,7 +243,7 @@
243243
type: "item"
244244
}
245245
]
246-
title: "{ftbquests.abydos.naquadah_armor.title}"
246+
title: "{ftbquests.asg.naquadah_armor.title}"
247247
x: -4.5d
248248
y: -6.5d
249249
}
@@ -252,7 +252,7 @@
252252
"60ECE277341A9408"
253253
"7A5734E3CF682EBA"
254254
]
255-
description: ["{ftbquests.preparing_for_dimensional_travel.super_pressure_heat_chamber.description}"]
255+
description: ["{ftbquests.asg.super_pressure_heat_chamber.description}"]
256256
hide_dependent_lines: true
257257
id: "59711F987DE95924"
258258
rewards: [{
@@ -272,7 +272,7 @@
272272
}
273273
{
274274
dependencies: ["239A0034C8425661"]
275-
description: ["{ftbquests.preparing_for_dimensional_travel.raw_void_ingot.description}"]
275+
description: ["{ftbquests.asg.raw_void_ingot.description}"]
276276
id: "0889A97E22C484CC"
277277
rewards: [{
278278
id: "515734ACECDB08A0"
@@ -293,7 +293,7 @@
293293
"60ECE277341A9408"
294294
"0889A97E22C484CC"
295295
]
296-
description: ["{ftbquests.preparing_for_dimensional_travel.void_ingot.description}"]
296+
description: ["{ftbquests.asg.void_ingot.description}"]
297297
id: "7A5734E3CF682EBA"
298298
rewards: [{
299299
count: 2
@@ -313,7 +313,7 @@
313313
}
314314
{
315315
dependencies: ["2F87FC1D5BB43220"]
316-
description: ["{ftbquests.preparing_for_dimensional_travel.echo_r.description}"]
316+
description: ["{ftbquests.asg.echo_r.description}"]
317317
icon: {
318318
Count: 1
319319
id: "gtceu:echo_r_bucket"
@@ -338,13 +338,13 @@
338338
type: "item"
339339
}
340340
]
341-
title: "{ftbquests.preparing_for_dimensional_travel.echo_r.title}"
341+
title: "{ftbquests.asg.echo_r.title}"
342342
x: -5.0d
343343
y: 5.0d
344344
}
345345
{
346346
dependencies: ["3479CEBD73550718"]
347-
description: ["{ftbquests.abydos.runic_tablet_fragments.description}"]
347+
description: ["{ftbquests.asg.runic_tablet_fragments.description}"]
348348
id: "5744150A5658FE4D"
349349
rewards: [{
350350
id: "615C650D39461500"
@@ -384,13 +384,13 @@
384384
type: "item"
385385
}
386386
]
387-
title: "{ftbquests.abydos.runic_tablet_fragments.title}"
387+
title: "{ftbquests.asg.runic_tablet_fragments.title}"
388388
x: 1.0d
389389
y: 7.0d
390390
}
391391
{
392392
dependencies: ["5744150A5658FE4D"]
393-
description: ["{ftbquests.abydos.runic_tablet_complete.description}"]
393+
description: ["{ftbquests.asg.runic_tablet_complete.description}"]
394394
id: "146F88E5C1119649"
395395
rewards: [{
396396
id: "2DDF7ACB3920B1DA"
@@ -802,7 +802,7 @@
802802
"58DCDBC6EE97CA5E"
803803
"6E5A8D4641052624"
804804
]
805-
description: ["{ftbquests.abydos.ancient_stargate_ring_block.description}"]
805+
description: ["{ftbquests.asg.ancient_stargate_ring_block.description}"]
806806
id: "5DADD2204991B4D5"
807807
rewards: [{
808808
id: "0C6EE8224B97BBA5"
@@ -829,7 +829,7 @@
829829
"101A7D0F395C7642"
830830
"330F222D8230852A"
831831
]
832-
description: ["{ftbquests.abydos.ancient_stargate_base_block.description}"]
832+
description: ["{ftbquests.asg.ancient_stargate_base_block.description}"]
833833
id: "6F9793149DE81FCC"
834834
rewards: [{
835835
id: "5A3140CEAF2772E4"
@@ -857,7 +857,7 @@
857857
"5DADD2204991B4D5"
858858
"039D327E919878BF"
859859
]
860-
description: ["{ftbquests.abydos.milky_way_stargate.description}"]
860+
description: ["{ftbquests.asg.milky_way_stargate.description}"]
861861
icon: {
862862
Count: 1
863863
id: "sgjourney:milky_way_stargate"
@@ -884,7 +884,7 @@
884884
}
885885
type: "item"
886886
}]
887-
title: "{ftbquests.abydos.milky_way_stargate.title}"
887+
title: "{ftbquests.asg.milky_way_stargate.title}"
888888
x: 0.0d
889889
y: -6.5d
890890
}
@@ -893,7 +893,7 @@
893893
"5DADD2204991B4D5"
894894
"21E115DFA9F2E14A"
895895
]
896-
description: ["{ftbquests.abydos.ancient_stargate_chevron_block.description}"]
896+
description: ["{ftbquests.asg.ancient_stargate_chevron_block.description}"]
897897
id: "63E36421AE07BC42"
898898
rewards: [{
899899
id: "1E1781F6129AF097"
@@ -982,12 +982,12 @@
982982
optional: true
983983
tasks: [{
984984
id: "3A2B0003E5046083"
985-
title: "{ftbquests.abydos.positioner.title}"
985+
title: "{ftbquests.positioner.title}"
986986
type: "checkmark"
987987
}]
988988
x: 0.0d
989989
y: 0.0d
990990
}
991991
]
992-
title: "A Portal of Lost Worlds"
992+
title: "{ftbquests.asg.title}"
993993
}

0 commit comments

Comments
 (0)