Skip to content

Commit 048a094

Browse files
committed
merge
2 parents fe0ce81 + 72a7d78 commit 048a094

File tree

77 files changed

+11989
-1168
lines changed

Some content is hidden

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

77 files changed

+11989
-1168
lines changed

config/almostunified/unification/materials.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"allthemodium",
66
"kubejs",
77
"mekanism",
8+
"bigreactors",
89
"modern_industrialization",
910
"occultism",
1011
"industrialforegoing",
11-
"bigreactors",
1212
"ae2",
1313
"enderio",
1414
"utilitarian",

config/bcc-common.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[general]
22
modpackProjectID = 1298402
33
modpackName = "ATM10 To the Sky"
4-
modpackVersion = "1.5.1"
4+
modpackVersion = "1.5.1b"
55
useMetadata = false
6-
6+

config/ftbquests/quests/chapters/basic_logistics.snbt

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,5 +1021,24 @@
10211021
x: -1.0d
10221022
y: 5.5d
10231023
}
1024+
{
1025+
id: "67A0164D3A25BE73"
1026+
rewards: [{
1027+
id: "0202B444E710B89D"
1028+
item: {
1029+
count: 1
1030+
id: "transfer_labels:label_accessor"
1031+
}
1032+
type: "item"
1033+
}]
1034+
size: 1.5d
1035+
tasks: [{
1036+
id: "1807A230BA87899B"
1037+
item: { components: { "ftbfiltersystem:filter": "mod(transfer_labels)" }, count: 1, id: "ftbfiltersystem:smart_filter" }
1038+
type: "item"
1039+
}]
1040+
x: 10.0d
1041+
y: 5.5d
1042+
}
10241043
]
1025-
}
1044+
}

0 commit comments

Comments
 (0)