Skip to content

Commit cf2261c

Browse files
KillLaAquaKillLaAqua
authored
Merge pull request #494 from StarT-Dev-Team/KOMARU-rebase
Rebasing Komaru Branch + Fixes + Missing Implementation + Adjustments
2 parents 11681f9 + 30189d2 commit cf2261c

140 files changed

Lines changed: 11991 additions & 8959 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
@@ -39,7 +39,7 @@
3939
"2C354B0735DF8023"
4040
"3C09E77C352B2A11"
4141
]
42-
description: ["{ftbquests.abydos.runic_casings.description}"]
42+
description: ["{ftbquests.asg.runic_casings.description}"]
4343
id: "379D69A44FC5B2F2"
4444
rewards: [{
4545
id: "06D88EE9C7DC14A5"
@@ -69,7 +69,7 @@
6969
type: "item"
7070
}
7171
]
72-
title: "{ftbquests.abydos.runic_casings.title}"
72+
title: "{ftbquests.asg.runic_casings.title}"
7373
x: 1.0d
7474
y: 4.5d
7575
}
@@ -82,7 +82,7 @@
8282
"25583D0BF59E1BC8"
8383
"7AC55BA8BDD0F3D2"
8484
]
85-
description: ["{ftbquests.abydos.runic_inscribe_manipulate.description}"]
85+
description: ["{ftbquests.asg.runic_inscribe_manipulate.description}"]
8686
id: "2C354B0735DF8023"
8787
rewards: [{
8888
count: 2
@@ -109,7 +109,7 @@
109109
"75F0388FAB52E0B3"
110110
"30C974448C57F0EC"
111111
]
112-
description: ["{ftbquests.abydos.inscribe_casing.description}"]
112+
description: ["{ftbquests.asg.inscribe_casing.description}"]
113113
hide_dependency_lines: true
114114
id: "624480A1E62B52EF"
115115
rewards: [{
@@ -128,7 +128,7 @@
128128
}
129129
{
130130
dependencies: ["2F26A144D29B00A5"]
131-
description: ["{ftbquests.abydos.nether_armor.description}"]
131+
description: ["{ftbquests.asg.nether_armor.description}"]
132132
id: "59B0F5DB2C1E96DC"
133133
rewards: [{
134134
id: "25BD037BA00CCCA2"
@@ -183,13 +183,13 @@
183183
type: "item"
184184
}
185185
]
186-
title: "{ftbquests.abydos.nether_armor.title}"
186+
title: "{ftbquests.asg.nether_armor.title}"
187187
x: -4.0d
188188
y: -7.0d
189189
}
190190
{
191191
dependencies: ["3479CEBD73550718"]
192-
description: ["{ftbquests.abydos.naquadah_armor.description}"]
192+
description: ["{ftbquests.asg.naquadah_armor.description}"]
193193
hide_dependency_lines: true
194194
id: "2F26A144D29B00A5"
195195
rewards: [{
@@ -244,7 +244,7 @@
244244
type: "item"
245245
}
246246
]
247-
title: "{ftbquests.abydos.naquadah_armor.title}"
247+
title: "{ftbquests.asg.naquadah_armor.title}"
248248
x: -6.0d
249249
y: -7.0d
250250
}
@@ -253,7 +253,7 @@
253253
"60ECE277341A9408"
254254
"7A5734E3CF682EBA"
255255
]
256-
description: ["{ftbquests.preparing_for_dimensional_travel.super_pressure_heat_chamber.description}"]
256+
description: ["{ftbquests.asg.super_pressure_heat_chamber.description}"]
257257
hide_dependent_lines: true
258258
id: "59711F987DE95924"
259259
rewards: [{
@@ -273,7 +273,7 @@
273273
}
274274
{
275275
dependencies: ["239A0034C8425661"]
276-
description: ["{ftbquests.preparing_for_dimensional_travel.raw_void_ingot.description}"]
276+
description: ["{ftbquests.asg.raw_void_ingot.description}"]
277277
id: "0889A97E22C484CC"
278278
rewards: [{
279279
id: "515734ACECDB08A0"
@@ -294,7 +294,7 @@
294294
"60ECE277341A9408"
295295
"0889A97E22C484CC"
296296
]
297-
description: ["{ftbquests.preparing_for_dimensional_travel.void_ingot.description}"]
297+
description: ["{ftbquests.asg.void_ingot.description}"]
298298
id: "7A5734E3CF682EBA"
299299
rewards: [{
300300
count: 2
@@ -314,7 +314,7 @@
314314
}
315315
{
316316
dependencies: ["2F87FC1D5BB43220"]
317-
description: ["{ftbquests.preparing_for_dimensional_travel.echo_r.description}"]
317+
description: ["{ftbquests.asg.echo_r.description}"]
318318
icon: {
319319
Count: 1
320320
id: "gtceu:echo_r_bucket"
@@ -339,13 +339,13 @@
339339
type: "item"
340340
}
341341
]
342-
title: "{ftbquests.preparing_for_dimensional_travel.echo_r.title}"
342+
title: "{ftbquests.asg.echo_r.title}"
343343
x: -5.0d
344344
y: 4.5d
345345
}
346346
{
347347
dependencies: ["3479CEBD73550718"]
348-
description: ["{ftbquests.abydos.runic_tablet_fragments.description}"]
348+
description: ["{ftbquests.asg.runic_tablet_fragments.description}"]
349349
id: "5744150A5658FE4D"
350350
rewards: [{
351351
id: "615C650D39461500"
@@ -385,13 +385,13 @@
385385
type: "item"
386386
}
387387
]
388-
title: "{ftbquests.abydos.runic_tablet_fragments.title}"
388+
title: "{ftbquests.asg.runic_tablet_fragments.title}"
389389
x: 1.0d
390390
y: 6.5d
391391
}
392392
{
393393
dependencies: ["5744150A5658FE4D"]
394-
description: ["{ftbquests.abydos.runic_tablet_complete.description}"]
394+
description: ["{ftbquests.asg.runic_tablet_complete.description}"]
395395
id: "146F88E5C1119649"
396396
rewards: [{
397397
id: "2DDF7ACB3920B1DA"
@@ -785,7 +785,7 @@
785785
"58DCDBC6EE97CA5E"
786786
"6E5A8D4641052624"
787787
]
788-
description: ["{ftbquests.abydos.ancient_stargate_ring_block.description}"]
788+
description: ["{ftbquests.asg.ancient_stargate_ring_block.description}"]
789789
id: "5DADD2204991B4D5"
790790
rewards: [{
791791
id: "0C6EE8224B97BBA5"
@@ -812,7 +812,7 @@
812812
"101A7D0F395C7642"
813813
"330F222D8230852A"
814814
]
815-
description: ["{ftbquests.abydos.ancient_stargate_base_block.description}"]
815+
description: ["{ftbquests.asg.ancient_stargate_base_block.description}"]
816816
id: "6F9793149DE81FCC"
817817
rewards: [{
818818
id: "5A3140CEAF2772E4"
@@ -841,7 +841,7 @@
841841
"039D327E919878BF"
842842
"2635B921AA9053D0"
843843
]
844-
description: ["{ftbquests.abydos.milky_way_stargate.description}"]
844+
description: ["{ftbquests.asg.milky_way_stargate.description}"]
845845
icon: {
846846
Count: 1
847847
id: "sgjourney:milky_way_stargate"
@@ -868,7 +868,7 @@
868868
}
869869
type: "item"
870870
}]
871-
title: "{ftbquests.abydos.milky_way_stargate.title}"
871+
title: "{ftbquests.asg.milky_way_stargate.title}"
872872
x: 0.0d
873873
y: -7.0d
874874
}
@@ -877,7 +877,7 @@
877877
"5DADD2204991B4D5"
878878
"21E115DFA9F2E14A"
879879
]
880-
description: ["{ftbquests.abydos.ancient_stargate_chevron_block.description}"]
880+
description: ["{ftbquests.asg.ancient_stargate_chevron_block.description}"]
881881
id: "63E36421AE07BC42"
882882
rewards: [{
883883
id: "1E1781F6129AF097"
@@ -966,12 +966,12 @@
966966
optional: true
967967
tasks: [{
968968
id: "3A2B0003E5046083"
969-
title: "{ftbquests.abydos.positioner.title}"
969+
title: "{ftbquests.positioner.title}"
970970
type: "checkmark"
971971
}]
972972
x: 0.0d
973973
y: 0.0d
974974
}
975975
]
976-
title: "A Portal of Lost Worlds"
976+
title: "{ftbquests.asg.title}"
977977
}

0 commit comments

Comments
 (0)