Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
This commit is contained in:
Pyritie
commit
54f01fbff0
5 changed files with 188 additions and 3558 deletions
|
|
@ -9,9 +9,9 @@
|
|||
- New machines to properly automate food, along with proper compatibility between machines and TFC's food system, so you can't turn rotten grains into fresh bread any more. The electric greenhouse now also always outputs fresh food. @ofoxsmith & @Redeix
|
||||
- New electric refrigerator with different tiers. You can craft the old one into this new one, but please take your food out of it before upgrading otherwise it will be lost! @ofoxsmith
|
||||
- Added many new advanced food items including freeze-dried fruit, calorie paste, and meal bags. @Redeix
|
||||
- Quest updates for all of the above @TomPlop
|
||||
- Quest updates for all of the above @TomPlop @Redeix
|
||||
- Main UI overhaul and curseforge branding updated @Redeix
|
||||
- Added sunflowers and rapeseed to make Bio Diesel viable (#1248) @34y34y34y34y34y34y34y34y34y
|
||||
- Added sunflowers and rapeseed to make Bio Diesel viable (#1248) @34y34y34y34y34y34y34y34y34y @Redeix
|
||||
- Create 6 update! @AirRice @aidie8
|
||||
### Minor changes
|
||||
- Balance changes for water wheels and glowstone blocks @Pyritie
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -9,29 +9,10 @@
|
|||
quest_links: [ ]
|
||||
quests: [
|
||||
{
|
||||
can_repeat: false
|
||||
description: ["{quests.tfg.welcome.desc}"]
|
||||
icon: "tfg:terra_firma_greg"
|
||||
id: "427814F6E9386772"
|
||||
rewards: [
|
||||
{
|
||||
auto: "no_toast"
|
||||
id: "49E401323B66BD59"
|
||||
item: {
|
||||
Count: 1
|
||||
id: "patchouli:guide_book"
|
||||
tag: {
|
||||
"patchouli:book": "tfc:field_guide"
|
||||
}
|
||||
}
|
||||
type: "item"
|
||||
}
|
||||
{
|
||||
auto: "no_toast"
|
||||
id: "3681660250209F02"
|
||||
item: "ftbquests:book"
|
||||
type: "item"
|
||||
}
|
||||
]
|
||||
shape: "gear"
|
||||
size: 4.0d
|
||||
subtitle: "{quests.tfg.welcome.subtitle}"
|
||||
|
|
@ -82,6 +63,7 @@
|
|||
y: 2.5d
|
||||
}
|
||||
{
|
||||
can_repeat: true
|
||||
dependencies: ["427814F6E9386772"]
|
||||
description: ["{quests.tfg.field_guide.desc}"]
|
||||
icon: {
|
||||
|
|
@ -92,32 +74,34 @@
|
|||
}
|
||||
}
|
||||
id: "3D7B0F3134C30364"
|
||||
rewards: [
|
||||
{
|
||||
id: "013F1894A0BED173"
|
||||
item: {
|
||||
Count: 1
|
||||
id: "patchouli:guide_book"
|
||||
tag: {
|
||||
"patchouli:book": "tfc:field_guide"
|
||||
}
|
||||
}
|
||||
type: "item"
|
||||
}
|
||||
{
|
||||
id: "71AF6F847DC58F4D"
|
||||
item: "ftbquests:book"
|
||||
type: "item"
|
||||
}
|
||||
]
|
||||
subtitle: "{quests.tfg.field_guide.subtitle}"
|
||||
tasks: [{
|
||||
dimension: "minecraft:overworld"
|
||||
icon: "gtceu:overworld_marker"
|
||||
id: "4433F67AD2E0F1D4"
|
||||
title: "{quests.stone_age.temperature.task}"
|
||||
type: "dimension"
|
||||
id: "28491210C53D9AB2"
|
||||
title: "{quests.tasktype.checkmark}"
|
||||
type: "checkmark"
|
||||
}]
|
||||
title: "{quests.tfg.field_guide.title}"
|
||||
x: 0.0d
|
||||
y: 3.5d
|
||||
}
|
||||
{
|
||||
dependencies: ["427814F6E9386772"]
|
||||
description: ["{quests.tfg.quest_shapes.desc}"]
|
||||
id: "4232E14D66AF2675"
|
||||
subtitle: "{quests.tfg.quest_shapes.subtitle}"
|
||||
tasks: [{
|
||||
id: "464F635C92FA02DC"
|
||||
title: "{quests.tfg.icons.title}"
|
||||
type: "checkmark"
|
||||
}]
|
||||
title: "{quests.tfg.quest_shapes.title}"
|
||||
x: 2.5d
|
||||
y: 2.5d
|
||||
}
|
||||
]
|
||||
subtitle: ["{quests.tfg.subtitle}"]
|
||||
title: "{quests.tfg}"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
default_hide_dependency_lines: false
|
||||
default_quest_shape: ""
|
||||
filename: "space_survival"
|
||||
group: "21D975CEBDE06BA9"
|
||||
group: "19428C6E7A36D463"
|
||||
icon: {
|
||||
Count: 1
|
||||
id: "ad_astra:tier_1_rocket"
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
id: "671B872DCEFCA5DD"
|
||||
images: [
|
||||
{
|
||||
alpha: 150
|
||||
height: 2.5d
|
||||
image: "ad_astra:textures/gui/sprites/space_station.png"
|
||||
rotation: 0.0d
|
||||
|
|
@ -114,7 +115,7 @@
|
|||
y: -8.0d
|
||||
}
|
||||
]
|
||||
order_index: 0
|
||||
order_index: 4
|
||||
quest_links: [
|
||||
{
|
||||
id: "62E455D8BAA50151"
|
||||
|
|
|
|||
|
|
@ -651,7 +651,7 @@
|
|||
"tfg.food_recipe.brining": "Brining",
|
||||
"tfg.food_recipe.smoking": "Smoking",
|
||||
"tfg.food_recipe.drying": "Drying",
|
||||
"tfg.food_recipe.freeze_drying": "Dessicate",
|
||||
"tfg.food_recipe.freeze_drying": "Desiccate",
|
||||
"tfg.recipe.macerator_warning": "Only outputs first slot until HV",
|
||||
"tfg.grapplemod.repair": "Repair recipe, keeps your upgrades. §lNEVER combine two grapples or you'll lose ALL your upgrades!§r",
|
||||
"tfg.grapplemod.upgrades.maxlen": "Increases §lMax Length§r by 20, up to 200.",
|
||||
|
|
@ -1682,7 +1682,7 @@
|
|||
"quests.ore_proc.packer.subtitle": "It's real fast",
|
||||
"quests.ore_proc.packer.desc": "Back in the old days of GregTech, this little bad boy saw a lot of use—you used to get a ton of &6Small&r and &6Tiny Dusts&r from ore processing.\n\nNowadays, it's only really useful for automatic packing, such as &dRare Earth&r in a &6Centrifuge&r returning many &6Small Piles of Dust&r.\n\nDon't forget: a &eRobot Arm&r set to Supply Exact mode can be useful to avoid clogging the input slots.",
|
||||
"quests.ore_proc.packer.task": "Any Packer",
|
||||
"quests.space_survival": "Space Survival",
|
||||
"quests.space_survival": "Tips - Space Survival",
|
||||
"quests.space_survival.subtitle": "The one place that hasn't been corrupted by capitalism... Space!",
|
||||
"quests.space_survival.preparations.title": "Pre-Launch Preparations",
|
||||
"quests.space_survival.preparations.subtitle": "Make sure you're ready!",
|
||||
|
|
@ -2169,7 +2169,7 @@
|
|||
"quests.tfg.quest_shapes.title": "Information about Quest Shapes.",
|
||||
"quests.tfg.quest_shapes.subtitle": "Turns out shapes help understand these quests.",
|
||||
"quests.tfg.quest_shapes.desc": "&lGears&r: Gear shaped quests are the biggest in each quest category, they represent the Start and End of questlines. You can consider these as major end goals.\n\n&lHearts&r: Heart shaped quests are &ooptional&r, they're not necesary for progression and mostly serve for completionist type players. Some optional quests may be a bit silly...\n\n&lOctagons:&r Octagons are important marks on certain quests, they represent milestones.",
|
||||
"quests.tfg_tips": "TerraFirmaGreg Tips",
|
||||
"quests.tfg_tips": "Tips - Survival",
|
||||
"quests.tfg_tips.subtitle": "Tips and Tricks to make your life slightly easier.",
|
||||
"quests.tfg_tips.beginning.title": "Tips and Tricks be here!",
|
||||
"quests.tfg_tips.beginning.subtitle": "Dear God that's a lot of branches...",
|
||||
|
|
@ -2272,7 +2272,7 @@
|
|||
"quests.tfg_tips.lava_lamp.desc": "With the very heat resistant metal &9Blue Steel&r, you can create a &dBlue Steel Lamp.&r It can be filled with &cLava&r, giving you an indefinite source of light at the cost of being limited to a single lamp metal.\n\nCareful handling a filled lava lamp, it's very &chot...&r",
|
||||
"quests.tfg_tips.glowstone_lamp.title": "Lamp Fuel: Glowstone",
|
||||
"quests.tfg_tips.glowstone_lamp.subtitle": "The best lamp fuel",
|
||||
"quests.tfg_tips.glowstone_lamp.desc": "You'll need access to at least &7LV&r electricity in order to liquefy &dGlowstone&r, but if you like the look of &lany&r lamp, you can use &6Liquid Glowstone&r to fuel them indefinitely. Unlike &cLave&r, this isn't hot!",
|
||||
"quests.tfg_tips.glowstone_lamp.desc": "You'll need access to at least &7LV&r electricity in order to liquefy &dGlowstone&r, but if you like the look of &lany&r lamp, you can use &6Liquid Glowstone&r to fuel them indefinitely. Unlike &cLava&r, this isn't hot!",
|
||||
"quests.tfg_tips.charcoal_pile.title": "Charcoal Pile",
|
||||
"quests.tfg_tips.charcoal_pile.subtitle": "You're going to need this",
|
||||
"quests.tfg_tips.charcoal_pile.desc.1": "&aCharcoal Piles&r are the early game source for &dCharcoal.&r You're going to need &oa lot&r of it if you want to succeed in &2TFG&r, as charcoal is key for &3Metalworking&r and smelting &3Blooms&r for &bWrought Iron&r.\n\nBegin by digging down a pit.",
|
||||
|
|
@ -2767,5 +2767,25 @@
|
|||
"quests.tfg_tips.lunchbox.title": "Lunch Box",
|
||||
"quests.tfg_tips.lunchbox.subtitle": "A refrigerator in your pocket!",
|
||||
"quests.tfg_tips.lunchbox.desc": "Lunch boxes have 9 slots for food, keeping it cold and longer lasting.\nThe Cooling Lunchbox has a stronger effect than the regular one, but needs to be provided with ice or capsules that will thaw over time.",
|
||||
"quests.tfg_tips.lunchbox.task": "Any Lunch Box"
|
||||
"quests.tfg_tips.lunchbox.task": "Any Lunch Box",
|
||||
"quests.tfg_tips.transportation_tips.subtitle": "What ever happened to walking on your own two feet?",
|
||||
"quests.tfg_tips.tools_tips.subtitle": "How to tighten and loosen 101.",
|
||||
"quests.tfg_tips.tools_tips.tools.title": "Tools",
|
||||
"quests.tfg_tips.tools_tips.tools.subtitle": "It's all a hammer anyways.",
|
||||
"quests.tfg_tips.tools_tips.tools.desc": "The only thing seperating man from animal is our use of &l&bTools&r&r. &8&oExcept for apes, monkeys, dolphins, crows, otters, octo.......&r&r Use your skills and tools to make the most of this world, and &5save yourself&r some effort.",
|
||||
"quests.tfg_tips.tools_tips.seed_oil.title": "Lamp Fuel: Seed Oil",
|
||||
"quests.tfg_tips.tools_tips.seed_oil.subtitle": "Smells good when it burns.",
|
||||
"quests.tfg_tips.tools_tips.seed_oil.desc": "&dSeed Oil&r will last you an impressive &c72&r days.",
|
||||
"quests.tfg_tips.tools_tips.seed_oil.task": "A Bucket of Seed Oil",
|
||||
"quests.tfg_tips.tools_tips.soybean_oil.title": "Lamp Fuel: Soybean Oil",
|
||||
"quests.tfg_tips.tools_tips.soybean_oil.subtitle": "Lamp on a high protein diet.",
|
||||
"quests.tfg_tips.tools_tips.soybean_oil.desc": "&dSoybean Oil&r lasts just as long as seed oil--&c72&r days. ",
|
||||
"quests.tfg_tips.tools_tips.soybean_oil.task": "A Bucket of Soybean Oil",
|
||||
"quests.tfg_tips.tools_tips.markings.title": "Markings",
|
||||
"quests.tfg_tips.tools_tips.markings.subtitle": "Comply with OSHA standard 1910.303",
|
||||
"quests.tfg_tips.tools_tips.markings.desc": "Similar to &2chalk&r--&d&lMarkings&r&r can be used to decorate your surfaces for a more immersive base. You can craft markings by first making a &bHazard Diamond Wall Marking&r and using a stonecutter to get the rest.",
|
||||
"quests.tfg_tips.tools_tips.markings.task": "Any #ags_modernmarkings:markings",
|
||||
"quests.tfg_tips.tools_tips.cryodesiccation.title": "Cryodesiccation",
|
||||
"quests.tfg_tips.tools_tips.cryodesiccation.subtitle": "The factory has no time for \"flavor\".",
|
||||
"quests.tfg_tips.tools_tips.cryodesiccation.desc": "&l&bCryodesiccation&r&r is the process of dehydrating food at very low temperatures. Food with the trait \"Cryodesiccated\" last considerably longer than other food preservation methods."
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue