Merge branch 'dev' into dev

Signed-off-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
Pyritie 2025-04-26 15:34:35 +01:00 committed by GitHub
commit b15a700cfe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 1090 additions and 965 deletions

View file

@ -2,29 +2,39 @@
## [Unreleased]
### Changes
- Increased Astikor Carts item size limit
- Fixed mining machines not working
- Fixed kaolin clay not generating in the overworld
- Changed some quests based on feedback
- Added recipes for digger helmet upgrades
- Updated field guide for 0.9 (oosyrag)
- Added speed boost to nanosuit leggings (SverhRazum-Nah)
- Updated max capacity of small vessel and crucible to be multiples of 144 (oosyrag)
- Added support for more armor trims from gems (Redeix)
- Added fishing nets (Redeix)
- Added more cloth alternatives (Redeix)
- Fixed milk curdling and olive oil recipes to be consistent with barrels/vats (TomPlop)
- Added universal circuits (from monifactory) for easier ae2 pattern upgrading (TomPlop)
- Added brine and vinegar recipes to GT machines (TomPlop)
- Increased Astikor Carts item size limit (Redeix)
- Changed some quests based on feedback
- Added recipes for digger helmet upgrades
- You can no longer use a blowpipe to hold hot ingots, but tongs have been buffed 6x instead
- You can no longer pick up regular ice with a saw to prevent moving around water sources, but you can craft packed ice instead if you need to cool off
- Added a temporary fix for the ULS-MV millstones/crushing wheels voiding poor raw ores
- Added a temporary fix for the mechanical mixer needing a programmed circuit item to work (craft them out of sticks)
- Fixed a duping exploit involving metal plated blocks
- Fixed some recipes that were using the wrong wrench tag
- Fixed mining machines not working
- Removed recipes for firmalife sprinklers. Use gt pipes instead, those can go through sprinkler walls now, and put your sprinklers on drums/fluid tanks/barrels
- Added an earlier way to get paracetamol (cures gregtech hazards)
- Removed recipes for firmalife sprinklers. Use GT pipes instead, those count as greenhouse walls now, and put your sprinklers on drums/fluid tanks/barrels
- Buffed the mixer glowstone recipe
- Nerfed kapok growth speed a little
- Added recipes to turn more things into biomass
- Added recipe to turn saplings into sticks
- Changed mud brick recipes to not require mortar any more
- Fixed not being able to pick up spring water or put it in a mixing bowl
- Buffed hot or not insulation items by x3
- Nerfed rotation speed controller recipe
- Now you can put a lot more items on tool racks
- Buffed nether mob loot tables
- Changed rotation speed controller recipe
- Now you can put many more things on tool racks
- Buffed some nether mob loot tables
- Buffed piglin bartering table
- Buffed string from cobwebs, TFC shears now work on them too
- The overworld graphite vein now spawns in every stone type
- Granitic/basaltic mineral sand is now usable for iron in primitive age
- Fixed butchery knives missing anvil recipes
@ -34,11 +44,14 @@
- Fixed red alloy/tin alloy double ingots not needing to be heated for anvil recipes
- Long distance item/fluid pipes now need HV
- Kaolin patches now spawn less often in lush cave biomes
- You can no longer pick up regular ice with a saw to prevent moving around water sources, but you can craft packed ice instead if you need to cool off
- Hid the xp bar because xp isn't used for anything
- Fixed visual workbench not working with tfc workbenches
- Removed adjustable chain gearshift and half of create:connected because they let you get around greate's restrictions
- Added recipe for vanilla campfire for people who like smoke particles
- Fixed AoE tools in bastion chests not having the AoE property
- Fixed various decorative glass block/pane recipes to be consistent
- Bricks and flagstones now use a cutter instead of an assembler
- Slimeballs now smelt into glue
- Removed some more duplicate recipes for vanilla items
- Hid some more things in JEI that aren't craftable
- Added fishing nets in many tiers for scooping fishies

View file

@ -1 +1,128 @@
{"clothes_hat":{"x":20,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"gtceu_magnet":{"x":0,"y":40,"enabled":false,"halign":"LEFT","valign":"TOP"},"feet":{"x":0,"y":60,"enabled":false,"halign":"LEFT","valign":"TOP"},"hands":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"TOP"},"belt":{"x":2,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"ring":{"x":2,"y":117,"enabled":true,"halign":"LEFT","valign":"TOP"},"back":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"bracelet":{"x":2,"y":-3,"enabled":true,"halign":"LEFT","valign":"CENTER"},"necklace":{"x":2,"y":146,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"body":{"x":2,"y":126,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_torso":{"x":20,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"curio":{"x":2,"y":136,"enabled":true,"halign":"LEFT","valign":"TOP"},"head":{"x":2,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"charm":{"x":2,"y":99,"enabled":true,"halign":"LEFT","valign":"TOP"},"adv_pattern_encoder":{"x":0,"y":300,"enabled":false,"halign":"LEFT","valign":"TOP"},"clothes_pants":{"x":20,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_socks":{"x":20,"y":44,"enabled":true,"halign":"LEFT","valign":"BOTTOM"}}
{
"clothes_hat": {
"x": 20,
"y": 98,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"gtceu_magnet": {
"x": 2,
"y": 116,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"hands": {
"x": 2,
"y": 44,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"belt": {
"x": 2,
"y": 62,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"ring": {
"x": 2,
"y": 117,
"enabled": true,
"halign": "LEFT",
"valign": "TOP"
},
"back": {
"x": 2,
"y": 80,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"bracelet": {
"x": 2,
"y": -3,
"enabled": true,
"halign": "LEFT",
"valign": "CENTER"
},
"necklace": {
"x": 2,
"y": 146,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"body": {
"x": 2,
"y": 126,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"clothes_torso": {
"x": 20,
"y": 80,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"example": {
"x": 0,
"y": 240,
"enabled": false,
"halign": "LEFT",
"valign": "TOP"
},
"curio": {
"x": 2,
"y": 136,
"enabled": true,
"halign": "LEFT",
"valign": "TOP"
},
"head": {
"x": 2,
"y": 98,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"charm": {
"x": 2,
"y": 99,
"enabled": true,
"halign": "LEFT",
"valign": "TOP"
},
"clothes_pants": {
"x": 20,
"y": 62,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"clothes_socks": {
"x": 20,
"y": 44,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"feet": {
"x": 0,
"y": 60,
"enabled": false,
"halign": "LEFT",
"valign": "TOP"
},
"adv_pattern_encoder": {
"x": 0,
"y": 300,
"enabled": false,
"halign": "LEFT",
"valign": "TOP"
}
}

View file

@ -46,7 +46,7 @@
rolling_mill_processing_duration = 400
#Rolling Mill base stress impact.
#Range: 0 ~ 1024
rolling_mill_stress = 0.5
rolling_mill_stress = 16
#Wires
[wires]

View file

@ -1,5 +1,5 @@
#List of slots to create or modify.
#See documentation for syntax: https://docs.illusivesoulworks.com/curios/configuration#slot-configuration
#
slots = []
slots = [ "id=head;add_cosmetic=false", "id=feet;size=0" ]

View file

@ -3,16 +3,7 @@
default_quest_shape: ""
filename: "ore_processing"
group: "19428C6E7A36D463"
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:crushed_iron_ore"
}
icon: "gtceu:crushed_iron_ore"
id: "24C1683140DBB5F2"
order_index: 4
quest_links: [ ]

View file

@ -971,16 +971,7 @@
]
dependency_requirement: "one_completed"
description: ["{quests.steam_age.red_alloy.desc}"]
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:red_alloy_ingot"
}
icon: "gtceu:red_alloy_ingot"
id: "781C6AD30194CB45"
shape: "square"
size: 1.0d

View file

@ -306,12 +306,6 @@
]
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:copper_saw"
tag: {
DisallowContainerItem: 0b
@ -1322,12 +1316,6 @@
]
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:copper_pickaxe"
tag: {
DisallowContainerItem: 0b
@ -2091,16 +2079,7 @@
{
dependencies: ["5E186CD5E83BFDF0"]
description: ["{quests.stone_age.crush_ore.desc}"]
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:crushed_copper_ore"
}
icon: "gtceu:crushed_copper_ore"
id: "2621BF784BEB7033"
subtitle: "{quests.stone_age.crush_ore.subtitle}"
tasks: [{
@ -2122,16 +2101,7 @@
{
dependencies: ["2621BF784BEB7033"]
description: ["{quests.stone_age.crush_crushed_ore.desc}"]
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:impure_copper_dust"
}
icon: "gtceu:impure_copper_dust"
id: "050444CE0EA04FDF"
subtitle: "{quests.stone_age.crush_crushed_ore.subtitle}"
tasks: [
@ -2168,16 +2138,7 @@
{
dependencies: ["050444CE0EA04FDF"]
description: ["{quests.stone_age.clean_dust.desc}"]
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:copper_dust"
}
icon: "gtceu:copper_dust"
id: "3462FD6E24F9BE0B"
subtitle: "{quests.stone_age.clean_dust.subtitle}"
tasks: [{

View file

@ -6,6 +6,7 @@
default_reward_team: false
detection_delay: 20
disable_gui: false
drop_book_on_death: false
drop_loot_crates: false
emergency_items_cooldown: 300
grid_scale: 0.5d
@ -24,6 +25,7 @@
}
pause_game: true
progression_mode: "flexible"
show_lock_icons: true
title: "TerraFirmaGreg"
version: 13
}

View file

@ -1,8 +0,0 @@
#Inventory sorter modules
[modules]
#Sorting module
sortingmodule = true
#Wheel move module
wheelmovemodule = true

View file

@ -1,21 +0,0 @@
[General]
#Invert the behavior of the shift key for extracting items
invertShift = false
#Invert left and right click action on drawers
invertClick = false
[Render]
#Distance in blocks before item labels stop rendering
labelRenderDistance = 25.0
#Distance in blocks before quantity numbers stop rendering
quantityRenderDistance = 10.0
#Distance in blocks before quantity numbers begin to fade out
quantityFadeDistance = 4.0
[Integration]
#Enable extended data display in WAILA if present
enableWaila = true
#Enable extended data display in The One Probe if present
enableTheOneProbe = true

View file

@ -1,36 +0,0 @@
[General]
#The number of item stacks held in a basic unit of storage.
#1x1 drawers hold 8 units, 1x2 drawers hold 4 units, 2x2 drawers hold 2 units.
#Half-depth drawers hold half those amounts.
baseStackStorage = 4
#Controller range defines how far away a drawer can be connected
#on X, Y, or Z planes. The default value of 50 gives the controller a very
#large range, but not beyond the chunk load distance.
#Range: 1 ~ 75
controllerRange = 50
enableUI = true
enableSidedInput = true
enableSidedOutput = true
enableItemConversion = true
enableExtraCompactingRules = true
debugTrace = false
#List of rules in format "domain:item1, domain:item2, n".
#Creates a compacting drawer rule to convert 1 of item1 into n of item2.
compactingRules = ["minecraft:clay, minecraft:clay_ball, 4"]
[StorageUpgrades]
#Storage upgrades multiply storage capacity by the given amount.
#When multiple storage upgrades are used together, their multipliers are added before being applied.
level1Mult = 2
level2Mult = 4
level3Mult = 8
level4Mult = 16
level5Mult = 32
[Integration]
#When true, shows quantity as NxS + R (by stack size) rather than count
wailaStackRemainder = true
#When true, does not show current quantities unless quantify key was used
wailaRespectQuantifyKey = false

View file

@ -0,0 +1,191 @@
[general]
#Enable rainbows
enableRainbow = true
#Enable planets
enablePlanets = true
#Enable monsters spawning on the surface during a blood moon event? Overwrites TFC's config for surface monsters
enableBloodmoonSurfaceMonsters = false
#Enable sun blindness? Looking at the sun for too long will make you blind for a period
enableSunBlindness = false
#Amount of days per real Earth month
#Range: 0.0 ~ 1.7976931348623157E308
averageDaysPerMonth = 30.436875
#Synodic period of the moon in days
#Range: 0.0 ~ 1.7976931348623157E308
moonOrbitalPeriod = 29.530588
#Moon scale factor
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
moonScale = 1.0
#Sun scale factor
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
sunScale = 0.725
#Planet scale factor
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
planetScale = 1.0
#Planet distance factor
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
planetDistance = 1.0
#Planet orbit velocity factor
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
planetOrbit = 1.0
#Seasonal tilt of Earth
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
earthSeasonalTilt = 23.44
#Bloodmoon spawn count multiplier
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
bloodmoonSpawnCountMultiplier = 1.0
#Average inclination to Earth equator for the Moon (in degrees).
#The closer to 0 this value is, the more frequent lunar and solar eclipses will be
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
moonEarthEquatorInclination = 23.43
#Diameter of Mercury (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
mercuryDiameter = 4879.0
#Diameter of Venus (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
venusDiameter = 12104.0
#Diameter of Earth (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
earthDiameter = 12742.0
#Diameter of Mars (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
marsDiameter = 6792.0
#Diameter of Jupiter (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
jupiterDiameter = 142984.0
#Diameter of Saturn (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
saturnDiameter = 120536.0
#Diameter of Uranus (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
uranusDiameter = 51118.0
#Diameter of Neptune (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
neptuneDiameter = 49528.0
#Diameter of Pluto (km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
plutoDiameter = 2376.0
#Tropical orbit period for Mercury (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
mercuryOrbitalPeriod = 87.968
#Tropical orbit period for Venus (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
venusOrbitalPeriod = 224.695
#Tropical orbit period for Earth (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
earthOrbitalPeriod = 365.242
#Tropical orbit period for Mars (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
marsOrbitalPeriod = 779.94
#Tropical orbit period for Jupiter (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
jupiterOrbitalPeriod = 4330.595
#Tropical orbit period for Saturn (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
saturnOrbitalPeriod = 10746.94
#Tropical orbit period for Uranus (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
uranusOrbitalPeriod = 30588.74
#Tropical orbit period for Neptune (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
neptuneOrbitalPeriod = 59799.9
#Sidereal orbit period for Pluto (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
plutoOrbitalPeriod = 90560.0
#Semi major axis for Mercury (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
mercurySemiMajorAxis = 57.909
#Semi major axis for Venus (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
venusSemiMajorAxis = 108.21
#Semi major axis for Earth (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
earthSemiMajorAxis = 149.598
#Semi major axis for Mars (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
marsSemiMajorAxis = 227.956
#Semi major axis for Jupiter (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
jupiterSemiMajorAxis = 778.479
#Semi major axis for Saturn (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
saturnSemiMajorAxis = 1432.041
#Semi major axis for Uranus (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
uranusSemiMajorAxis = 2867.043
#Semi major axis for Neptune (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
neptuneSemiMajorAxis = 4514.953
#Semi major axis for Pluto (10^6 km)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
plutoSemiMajorAxis = 5869.656
#Synodic period for Mercury (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
mercurySynodicPeriod = 115.88
#Synodic period for Venus (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
venusSynodicPeriod = 583.92
#Synodic period for Mars (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
marsSynodicPeriod = 779.94
#Synodic period for Jupiter (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
jupiterSynodicPeriod = 4330.595
#Synodic period for Saturn (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
saturnSynodicPeriod = 378.09
#Synodic period for Uranus (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
uranusSynodicPeriod = 369.66
#Synodic period for Neptune (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
neptuneSynodicPeriod = 367.49
#Synodic period for Pluto (in real Earth days)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
plutoSynodicPeriod = 366.73
#Ecliptic plane for Mercury (in degrees)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
mercuryEclipticPlane = 7.004
#Ecliptic plane for Venus (in degrees)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
venusEclipticPlane = 3.395
#Ecliptic plane for Mars (in degrees)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
marsEclipticPlane = 1.848
#Ecliptic plane for Jupiter (in degrees)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
jupiterEclipticPlane = 1.304
#Ecliptic plane for Saturn (in degrees)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
saturnEclipticPlane = 2.486
#Ecliptic plane for Uranus (in degrees)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
uranusEclipticPlane = 0.77
#Ecliptic plane for Neptune (in degrees)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
neptuneEclipticPlane = 1.77
#Ecliptic plane for Pluto (in degrees)
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
plutoEclipticPlane = 17.16
#Enable auroras
enableAurora = true
#The maximum aurora bands that will be rendered
#Range: 0 ~ 3
maxBands = 3
[debug]
#When enabled, prints debug values to console.
enableDebug = false
#x value factor.
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
xFactor = 0.0
#y value factor.
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
yFactor = 0.0
#z value factor.
#Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
zFactor = 0.0
#Toggle blend.
enableBlend = false

View file

@ -6,19 +6,21 @@ const registerComfortsRecipes = (event) => {
event.remove({ mod: "comforts" })
//Rope and Nail
event.recipes.minecraft.crafting_shapeless("comforts:rope_and_nail", ["firmaciv:rope_coil", "gtceu:wrought_iron_screw"])
event.shapeless("comforts:rope_and_nail", ["firmaciv:rope_coil", "gtceu:wrought_iron_screw"])
.id("comforts:crafting/shaped/rope_and_nail");
//sleeping bag
event.recipes.minecraft.crafting_shaped("comforts:sleeping_bag_white", [
"AAA",
"B "
], {
A: "#tfc:high_quality_cloth",
B: 'tfc:bone_needle'
});
event.recipes.tfc.damage_inputs_shaped_crafting(
event.shaped("comforts:sleeping_bag_white", [
"AAA",
"B "
], {
A: "#tfc:high_quality_cloth",
B: 'tfc:bone_needle'
})
).id('comforts:shaped/sleeping_bag_white');
event.recipes.minecraft.crafting_shaped("comforts:hammock_white", [
event.shaped("comforts:hammock_white", [
"ABA",
"CCC",
"ABA"

View file

@ -1,9 +1,9 @@
PlayerEvents.tick((event) => {
const { player } = event;
if (player.age % 100 != 0) return;
if (player.legsArmorItem == 'gtceu:nanomuscle_leggings') {
player.potionEffects.add("minecraft:speed", 350, 1, true, false);
} else {
player.removeEffect("minecraft:speed");
}
});
PlayerEvents.tick((event) => {
const { player } = event;
if (player.age % 100 != 0) return;
if (player.legsArmorItem == 'gtceu:nanomuscle_leggings') {
player.potionEffects.add("minecraft:speed", 350, 1, true, false);
} else {
player.removeEffect("minecraft:speed");
}
});

View file

@ -611,4 +611,6 @@ function removeGTCEURecipes(event) {
event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' })
event.remove({ id: 'gtceu:compressor/bricks' })
event.remove({ id: 'gtceu:smelting/sticky_resin_from_slime' })
}

View file

@ -990,4 +990,6 @@ const registerMinecraftRecipes = (event) => {
.duration(60)
.EUt(GTValues.VA[GTValues.ULV])
//#endregion
event.smelting('tfc:glue', 'minecraft:slime_ball').id('tfg:smelting/slime_to_glue')
}

View file

@ -176,23 +176,23 @@ function registerTFCMachineRecipes(event) {
// Curdled milk
event.recipes.gtceu.fermenter('tfg:fermenter/curdled_milk')
.inputFluids(Fluid.of('minecraft:milk', 1000))
.inputFluids(Fluid.of('minecraft:milk', 2000))
.itemInputs('firmalife:rennet')
.outputFluids(Fluid.of('tfc:curdled_milk'))
.outputFluids(Fluid.of('tfc:curdled_milk', 2000))
.duration(2400)
.EUt(16)
event.recipes.gtceu.fermenter('tfg:fermenter/curdled_yak_milk')
.inputFluids(Fluid.of('firmalife:yak_milk', 1000))
.inputFluids(Fluid.of('firmalife:yak_milk', 2000))
.itemInputs('firmalife:rennet')
.outputFluids(Fluid.of('firmalife:curdled_yak_milk'))
.outputFluids(Fluid.of('firmalife:curdled_yak_milk', 2000))
.duration(2400)
.EUt(16)
event.recipes.gtceu.fermenter('tfg:fermenter/curdled_goat_milk')
.inputFluids(Fluid.of('firmalife:goat_milk', 1000))
.inputFluids(Fluid.of('firmalife:goat_milk', 2000))
.itemInputs('firmalife:rennet')
.outputFluids(Fluid.of('firmalife:curdled_goat_milk'))
.outputFluids(Fluid.of('firmalife:curdled_goat_milk', 2000))
.duration(2400)
.EUt(16)
@ -303,7 +303,7 @@ function registerTFCMachineRecipes(event) {
event.recipes.gtceu.mixer('tfg:tfc/olive_oil_water')
.inputFluids(Fluid.of('water', 200))
.itemInputs('2x tfc:olive_paste')
.itemInputs('1x tfc:olive_paste')
.outputFluids(Fluid.of('tfc:olive_oil_water', 200))
.duration(200)
.EUt(28)
@ -316,6 +316,26 @@ function registerTFCMachineRecipes(event) {
//#endregion
// Vinegar and Brine
global.TFC_ALCOHOL.forEach(alcohol => {
event.recipes.gtceu.fermenter(`tfg:tfc/vinegar/${alcohol.id.replace(':', '_')}`)
.itemInputs('#tfc:foods/fruits')
.inputFluids(Fluid.of(alcohol.id, 250))
.outputFluids(Fluid.of('tfc:vinegar', 250))
.duration(600)
.EUt(28)
})
event.recipes.gtceu.mixer('tfg:tfc/brine')
.inputFluids(Fluid.of('tfc:salt_water', 900))
.inputFluids(Fluid.of('tfc:vinegar', 100))
.outputFluids(Fluid.of('tfc:brine', 1000))
.duration(100)
.EUt(16)
//#endregion
// Lamp Glass
event.recipes.gtceu.alloy_smelter(`tfg:tfc/lamp_glass`)
.itemInputs('#tfc:glass_batches')
@ -446,4 +466,4 @@ function registerTFCMachineRecipes(event) {
// Jute Fiber
generateMixerRecipe(event, 'tfc:jute', Fluid.of('minecraft:water', 200), 'tfc:jute_fiber', null, [], 100, 4, 16, 'tfg:tfc/jute_fiber')
}
}

View file

@ -163,15 +163,18 @@ function registerTFGMiscellaneousRecipes(event) {
.EUt(GTValues.VA[GTValues.ULV]);
//Airship Balloon
event.shaped('tfg:airship_balloon', [
'ABA',
'BCB',
'ABA'
], {
A: '#forge:string',
B: 'immersive_aircraft:sail',
C: 'tfc:bone_needle'
}).id('tfg:shaped/airship_balloon')
event.recipes.tfc.damage_inputs_shaped_crafting(
event.shaped('tfg:airship_balloon', [
'ABA',
'BCB',
'ABA'
], {
A: '#forge:string',
B: 'immersive_aircraft:sail',
C: 'tfc:bone_needle'
})
).id('tfg:shaped/airship_balloon')
event.recipes.gtceu.assembler('tfg:assembler/airship_balloon')
.itemInputs('4x immersive_aircraft:sail', '4x #forge:string')
.itemOutputs('tfg:airship_balloon')

View file

@ -1017,6 +1017,18 @@ global.TFC_MILKS = [
{id: 'firmalife:coconut_milk'},
];
global.TFC_ALCOHOL = [
{id: 'tfc:beer'},
{id: 'tfc:cider'},
{id: 'tfc:rum'},
{id: 'tfc:sake'},
{id: 'tfc:vodka'},
{id: 'tfc:whiskey'},
{id: 'tfc:corn_whiskey'},
{id: 'tfc:rye_whiskey'},
{id: 'firmalife:mead'},
];
global.TFC_MAGMA_BLOCKS = [
'tfc:rock/magma/granite',
'tfc:rock/magma/diorite',

File diff suppressed because it is too large Load diff