Skip to content

Commit 24761ec

Browse files
A few quest/script bugfixes
GT Tools quests now ignore NBT
1 parent fa4a86a commit 24761ec

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

config/InvTweaks.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Inventory Tweaks Configuration
22
#(Regarding shortcuts, all key names can be found at: http://legacy.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html)
3-
#Fri Sep 29 16:48:34 EDT 2023
3+
#Sat Sep 30 12:56:53 EDT 2023
44
enableMiddleClick=true
55
showChestButtons=true
66
enableSortingOnPickup=false

config/astralsorcery/amulet_enchantments.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
##########################################################################################################
88

99
data {
10-
# [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [advancedrocketry:spacebreathing:10], [endercore:xpboost:5], [endercore:autosmelt:2], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [enderio:witherweapon:5], [enderio:repellent:1], [enderio:soulbound:1], [enderio:witherarrow:5], [bewitchment:magic_protection:1], [gregtech:disjunction:5], [gregtech:hard_hammer:5], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1]]
10+
# [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [advancedrocketry:spacebreathing:10], [endercore:xpboost:5], [endercore:autosmelt:2], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [enderio:witherarrow:5], [enderio:repellent:1], [enderio:witherweapon:5], [enderio:soulbound:1], [bewitchment:magic_protection:1], [gregtech:disjunction:5], [gregtech:hard_hammer:5], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1]]
1111
S:data <
1212
minecraft:protection:10
1313
minecraft:fire_protection:5

config/betterquesting/DefaultQuests.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"properties:10": {
6060
"betterquesting:10": {
6161
"autoclaim:1": 0,
62-
"desc:8": "Exploring the world, you may notice some things. Most significantly, you cannot punch trees to collect wood! This is caused by the mod PyroTech, which significantly overhauls Stone Age progression. To proceed, you will need to collect a few things.\n\n§7Rocks§r: Can be found on the ground in most areas and collected by breaking.\n\n§2§2§a§2Sticks§r: Can be obtained by breaking leaves on trees.\n\n§aPlant Fibers§r: Can be obtained by breaking tall grass.",
62+
"desc:8": "Exploring the world, you may notice some things. Most significantly, you cannot punch trees to collect wood! This is caused by the mod PyroTech, which significantly overhauls Stone Age progression. To proceed, you will need to collect a few things.\n\n§7Rocks§r: Can be found on the ground in most areas and collected by breaking.\n\n§2§2§a§2Sticks§r: Can be obtained by breaking leaves on trees.\n\n§aPlant Fibers§r: Can be obtained by breaking grass.",
6363
"globalshare:1": 0,
6464
"icon:10": {
6565
"Count:3": 1,
@@ -1224,7 +1224,7 @@
12241224
"autoConsume:1": 0,
12251225
"consume:1": 0,
12261226
"groupDetect:1": 0,
1227-
"ignoreNBT:1": 0,
1227+
"ignoreNBT:1": 1,
12281228
"index:3": 0,
12291229
"partialMatch:1": 1,
12301230
"requiredItems:9": {
@@ -1378,7 +1378,7 @@
13781378
"autoConsume:1": 0,
13791379
"consume:1": 0,
13801380
"groupDetect:1": 0,
1381-
"ignoreNBT:1": 0,
1381+
"ignoreNBT:1": 1,
13821382
"index:3": 0,
13831383
"partialMatch:1": 1,
13841384
"requiredItems:9": {
@@ -13924,7 +13924,7 @@
1392413924
},
1392513925
"questSettings:10": {
1392613926
"betterquesting:10": {
13927-
"editmode:1": 1,
13927+
"editmode:1": 0,
1392813928
"hardcore:1": 0,
1392913929
"home_anchor_x:5": 0.5,
1393013930
"home_anchor_y:5": 0.0,

config/jei/worldSettings.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ world-1780728105 {
1212

1313

1414
world-78688046 {
15+
# Show the list of bookmarks next to open GUIs.
1516
B:bookmarkOverlayEnabled=true
1617

1718
# Give items instead of showing the recipe.

config/splash.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Splash screen properties
2-
#Fri Sep 29 16:46:50 EDT 2023
2+
#Sat Sep 30 12:55:11 EDT 2023
33
logoOffset=0
44
barBackground=0xFFFFFF
55
memoryGood=0x78CB34
@@ -16,5 +16,5 @@ background=0xFFFFFF
1616
bar=0xCB3D35
1717
resourcePackPath=resources
1818
barBorder=0xC0C0C0
19-
fontTexture=textures/font/ascii.png
2019
=\=\=\=\=\=\=
20+
fontTexture=textures/font/ascii.png

scripts/avaritia.zs

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ var fusionReactor = mods.gregtech.recipe.RecipeMap.getByName("fusion_reactor");
1616
// Infinity
1717

1818
mods.avaritia.ExtremeCrafting.remove(<avaritia:resource:6>);
19-
fusionReactor.recipeBuilder()
20-
.fluidInputs([<liquid:alloyium> * 20, <liquid:periodicium>*20])
21-
.fluidOutputs(<liquid:infinity> * 50)
22-
.duration(50)
23-
.EUt(130720)
24-
.property("eu_to_start", 150000000)
25-
.buildAndRegister();
19+
// fusionReactor.recipeBuilder()
20+
// .fluidInputs([<liquid:alloyium> * 20, <liquid:periodicium>*20])
21+
// .fluidOutputs(<liquid:infinity> * 50)
22+
// .duration(50)
23+
// .EUt(130720)
24+
// .property("eu_to_start", 150000000)
25+
// .buildAndRegister();

0 commit comments

Comments
 (0)