Skip to content

Commit 3ea7787

Browse files
committed
1.56
1 parent a1f5229 commit 3ea7787

Some content is hidden

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

69 files changed

+314
-24
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
x: 18.0d,
3+
y: -1.5d,
4+
dependencies: [
5+
"cfb1a857"
6+
],
7+
tasks: [{
8+
uid: "2c634cc6",
9+
type: "item",
10+
items: [{
11+
item: "defiledlands:scuronotte"
12+
}]
13+
},
14+
{
15+
uid: "12a3779f",
16+
type: "item",
17+
items: [{
18+
item: "defiledlands:defilement_powder"
19+
}]
20+
}]
21+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
x: 18.0d,
3+
y: 0.0d,
4+
dependencies: [
5+
"47be9fd3"
6+
],
7+
tasks: [{
8+
uid: "66084fbe",
9+
type: "item",
10+
items: [{
11+
item: "theaurorian:mushroomsmall"
12+
}]
13+
}]
14+
}

config/ftbquests/normal/chapters/940d670c/059a2fb7.snbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
2-
title: "111111",
2+
title: "{940d670c.ia.059a2fb7}",
33
x: 1.0d,
44
y: 1.5d,
5+
text: [
6+
"{940d670c.ia.34719d6d}"
7+
],
58
dependencies: [
69
"e0b379a0"
710
],
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
x: 6.5d,
3+
y: 1.0d,
4+
tasks: [{
5+
uid: "1ae93199",
6+
type: "item",
7+
items: [{
8+
item: "akashictome:tome"
9+
}],
10+
ignore_damage: true,
11+
ignore_nbt: 1b
12+
}]
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
x: 5.0d,
3+
y: 1.0d,
4+
tasks: [{
5+
uid: "c402626c",
6+
type: "item",
7+
items: [{
8+
item: "omniwand:wand"
9+
}],
10+
ignore_damage: true,
11+
ignore_nbt: 1b
12+
}]
13+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
x: 8.0d,
3+
y: 1.0d,
4+
tasks: [{
5+
uid: "8482d765",
6+
type: "item",
7+
items: [{
8+
id: "tiabs:timeinabottle",
9+
tag: {}
10+
}],
11+
consume_items: true,
12+
ignore_damage: true,
13+
ignore_nbt: 1b
14+
}],
15+
rewards: [{
16+
uid: "8f7e3b5f",
17+
type: "item",
18+
item: {
19+
id: "tiabs:timeinabottle",
20+
tag: {
21+
timeData: {
22+
storedTime: 1728000
23+
}
24+
}
25+
}
26+
}]
27+
}

config/localizator.cfg

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
# Configuration file
2+
3+
general {
4+
5+
##########################################################################################################
6+
# mixins
7+
#--------------------------------------------------------------------------------------------------------#
8+
# Enable/Disable Tweaks
9+
##########################################################################################################
10+
11+
mixins {
12+
# Localizes the MILD/COOL/WARM hardcoded texts when applying an Ozzy liner to a piece of armor.
13+
B:"(ArmorUnder) Ozzy Liner text Mixin"=false
14+
15+
# Localize message sent from the server when the Battle Tower Golem is defeated.
16+
B:"(BattleTowers) Golem Defeated Message Mixin"=false
17+
18+
# Localizes the "hits remaining" hardcoded text
19+
# added to a weapon's tooltip when it has been imbued with a potion in a cauldron.
20+
B:"(BetterSurvival) Potion-Imbued Weapons Tooltip Mixin"=false
21+
22+
# Enables Client - "(BountifulBaubles) Remove Modifier from Name" config option.
23+
B:"(BountifulBaubles) No Modifier at Name Mixin"=false
24+
25+
# Localizes Special Cakes Hardcoded Names.
26+
B:"(Charm) Localized Cake Name Mixin"=false
27+
28+
# Localizes the Composter JEI Recipe Integration GUI.
29+
B:"(Charm) Localized Composter JEI Mixin"=false
30+
31+
# Localizes the Grave Scroll description.
32+
B:"(CorpseComplex) Grave Scroll Description Mixin"=false
33+
34+
# If you hate those weird "Â" symbols in the Staff tooltip as much as me, enable this Mixin.
35+
B:"(DyamicTrees) Staff Mixin"=false
36+
37+
# Localizes few texts in the Mod List screen.
38+
B:"(FML) Localized Mod List GUI Mixin"=false
39+
40+
# Enables support for Language keys in all Forgotten Items' items descriptions.
41+
B:"(ForgottenItems) Tooltips Mixin"=false
42+
43+
# The messages received from the server will be translated on client side to match their locale.
44+
B:"(Lycanites) Client-side Translated Messages Mixin"=false
45+
46+
# Enables Client - "(Minecraft) Translate Boss Custom Names" config option.
47+
B:"(Minecraft) Boss Custom Names Mixin"=false
48+
49+
# Enables Localized Lore "LocLore" NBT tag support for items.
50+
B:"(Minecraft) Localized Lore Mixin"=false
51+
52+
# Enables Localized Title "locTitle" and Author "locAuthor" NBT tags support for Written Books.
53+
B:"(Minecraft) Localized Written Book Mixin"=false
54+
55+
# Enables Client - "(Minecraft) Translate Mob Custom Names" config option.
56+
B:"(Minecraft) Mob Custom Names Mixin"=false
57+
58+
# Enables Client - "(Neat) Translate Names In Health Bar" config option.
59+
B:"(Neat) Health Bar Mixin"=false
60+
61+
# Modifies the lang keys of Rough Tweaks items, so they don't collide with FirstAid.
62+
# Also, Enables the Client config:
63+
# - "(RoughTweaks) Show Heal Amount".
64+
B:"(RoughTweaks) Localized Names and Better Tooltip Mixin"=false
65+
66+
# Localizes the "Current Adaptation:" and "reduction:" hardcoded texts at armor tooltip.
67+
B:"(SRParasites) Armor Tooltips Mixin"=false
68+
69+
# Localizes the "Fertile Seasons:", and seasons hardcoded texts at crop tooltip.
70+
# Also adds support to Rustic's Tomato Seeds and Chili seeds.
71+
B:"(SereneSeasons) Localized Crop Fertility Tooltip Mixin"=false
72+
73+
# Enables support for Language keys in Set and Bonus names (config file).
74+
B:"(SetBonus) Tooltip Mixin"=false
75+
76+
# Enables support for Language Keys in Entity's CustomName tag.
77+
B:"(WAILA) Entity Name Mixin"=false
78+
}
79+
80+
##########################################################################################################
81+
# client
82+
#--------------------------------------------------------------------------------------------------------#
83+
# Client-Side Options
84+
##########################################################################################################
85+
86+
client {
87+
# Prevents a Bauble's Modifier from displaying at its Name
88+
B:"(BountifulBaubles) Remove Modifier from Bauble Name"=false
89+
90+
# Applies Mixins - "(Minecraft) Boss Custom Names Mixin". This mixin needs to be enabled.
91+
B:"(Minecraft) Translate Boss Custom Names"=false
92+
93+
# Applies Mixins - "(Minecraft) Mob Custom Names Mixin". This mixin needs to be enabled.
94+
B:"(Minecraft) Translate Mob Custom Names"=false
95+
96+
# Applies Mixins - "(Neat) Health Bar Mixin". This mixin needs to be enabled.
97+
B:"(Neat) Translate Names In Health Bar"=false
98+
99+
# Removes the need of Shift on RoughTweaks Items Tooltip to show the Heal Amount.
100+
# - "(RoughTweaks) Localized Names and Better Tooltip Mixin" needs to be enabled.
101+
B:"(RoughTweaks) Show Heal Amount"=false
102+
103+
# In SRP armor tooltip, translate resisted damage sources names.
104+
# Entity names are taken from the registry.
105+
# Non-entity names are taken from this mod's lang file.
106+
# §cDisable this if it impacts performance.
107+
B:"(SRParasites) Translate Resisted Damage Sources"=false
108+
}
109+
110+
}
111+
112+

config/modularmachinery/modularmachinery.cfg

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ auto-assembly {
1313
# Set whether to skip blocks containing NBTs. [default: false]
1414
B:skipBlockContainNBT=false
1515

16-
# Set how many ticks to assemble the block once. [range: 0 ~ 1000, default: 5]
16+
# Set how many ticks to assemble the block once. [range: 1 ~ 1000, default: 5]
1717
I:tickBlock=5
1818
}
1919

@@ -264,7 +264,10 @@ general {
264264
# When enabled, allows you to use the flux network to transfer larger amounts of energy than 2147483647. [default: true]
265265
B:enable-fluxnetworks-integration=true
266266

267-
# Defines the _default_ color for machine casings as items or blocks. (Hex color without alpha) Has to be defined both server and clientside! [default: FF4900]
267+
# When enabled, players using the controller will have their owner checked and non-owners will be denied access. [default: false]
268+
B:enable-security-system=false
269+
270+
# Defines the _default_ color for machine casings as items or blocks. (Hex color without alpha) Has to be defined both server and clientside! [default: FFFFFF]
268271
S:general-casing-color=FF4900
269272

270273
# When delayed-structure-check is enabled, what is the maximum check interval? (TimeUnit: Tick) [range: 2 ~ 1200, default: 100]
@@ -275,8 +278,6 @@ general {
275278

276279
# When enabled, Modules no longer register a separate controller for each machine, and the modular-controller-compatible-mode option is turned off. [default: false]
277280
B:only-one-machine-controller=false
278-
279-
# Provide selective updates for certain tile entities that tend to consume a lot of bandwidth to relieve network pressure. [default: true]
280281
B:selective-update-tileentity=true
281282

282283
# The multiblock structure checks the structural integrity at how often? (TimeUnit: Tick) [range: 1 ~ 1200, default: 30]

config/nae2.cfg

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,23 @@ beam_formers {
88
}
99

1010

11+
dense_cells {
12+
# Add CPU storage counterparts
13+
B:dense_cpu_storage_units=false
14+
B:enabled=false
15+
}
16+
17+
18+
dense_cpu_coprocessors {
19+
B:enabled=true
20+
}
21+
22+
23+
dense_fluid_cells {
24+
B:enabled=false
25+
}
26+
27+
1128
interface_p2p {
1229
B:enabled=true
1330
}

scripts/recipes/mods/AA.zs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#reloadable
12
import crafttweaker.item.IItemStack;
23
import scripts.grassUtils.RecipeUtils;
34
import crafttweaker.item.IItemDefinition;

0 commit comments

Comments
 (0)