Commit graph

299 commits

Author SHA1 Message Date
Pyritie
cef7822876 workaround for #910 2025-05-07 21:54:07 +01:00
Redeix
6b364bcf01
Quick Fixes (#962)
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe
2025-05-07 09:26:11 +01:00
Xikaro
3b34dd634a Merge remote-tracking branch 'origin/main' into dev 2025-05-06 01:45:19 +05:00
Pyritie
10fb12f77b reverting part of 506faea because it screwed with tags 2025-05-05 20:30:02 +01:00
Pyritie
f0845f2c69
Release: 0.9.3 (#951)
* changed Caelum to be on the server too, since tfc-caelum is also a server mod

* added caelum + tfc-caelum to pakku

* fixed stress levels on the rolling mill

* fixed lang files for universal circuits

* changed early game recipes to use small gears instead of large, to avoid duping, and make cogs easier

* Update carryon-common.toml

Carry On's config doesn't seem to work with tags (#), so I explicitly added the framedblocks chest and the tfc chests to the whitelist. I also removed storage drawers since they aren't in use.

Signed-off-by: NobleWasTaken <137561393+NobleWasTaken@users.noreply.github.com>

* - Missed this commit last time oops

* Fixed nano legs buff from also removing speed buff, for now

* Added recycling recipes for your old molds

* lowered recipe speed of bulk washing

* Added more details to ore hazards field guide entry

* Bump actions/download-artifact in the dependencies group

Bumps the dependencies group with 1 update: [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/download-artifact` from 4.2.1 to 4.3.0
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4.2.1...v4.3.0)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: 4.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* will you leave me alone if I submit these, ftbquests?

* more create SU adjustments

* - Added recipe to separate fertilizer into pure sources, and mix them back together.
- Added recipes to sew hides together and cut them apart.

* ore basics + hazards field guide entry tweaks

* big field guide update! all ore veins are now generated with our tool!

* toned down how many sticks were being placed in the nether

* remove caelum + tfc caelum #922

* - Added recipe to separate fertilizer into pure sources, and mix them back together. (#927)

- Added recipes to sew hides together and cut them apart.

* the placeholder programmed circuit recipe is now a stick + wrench, so it doesn't confuse new players as much

* updated changelog

* changed some create recipes to use bolts instead of nuggets, so they're available earlier

* moved surface_kaolin to mechanics category

* changed realgar item set

* Add README file to server overrides

* Fix tips quest issues (#937)

* - Fixed supports

* fixed some incorrect assembler recipes for create items

* improved texture of nether quartz ore + the raw ore block of the quartz material set

* greate buffs

* remove brick duping

* removed treated wood boats

* clay decomposition now requires HV

* added a potential fix for #944 suggested by ghosti, cleaned up some other abuses of it in tag events so now it's just indicators that still have to use it

* fixed tfc tool tags

* fluix's displayed formula is now more accurate to its material composition

* nerfed stone dust centrifuging, added a basic tape recipe that uses tfc glue

* fixes #932

* Allow red/tin alloy double ingot piles, add textures (#948)

* Mv quest rework (#920)

* Changes for MV Quests

* First fix for Progression tab

* fixes lang title

Signed-off-by: TomPlop <tomdidome@gmail.com>

* Changes for LV, fixes for quest categories, adding GT Tips, adding Gregtech energy, rework of Progression tab

* fix macerator separator

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>

* - the other ae2 wireless terminals are now all in late EV
- MEGA ae2 stuff now requires naq instead of a singularity

* coke and coal are no longer gems, and moss is no longer dirt

* fixed some icon sets

* the nether now has a gas collector recipe

* update changelog

* some more ae2 tweaking

* better recipe for the universal wireless terminal

* swapped colors of nickel and platinum, so nickel more closely matches the tfc textures

* doubled capacity of greate shafts! also adjusted the alternator to match

* fix: gui_main_menu

* pakku update

* fix: gui_main_menu 2

* Update mods

* removed beneath's cursecoal and sylvite veins, made tfg ones instead so they're added to the field guide

* new main menu panorama!

* update changelog

* update changelog

* added death punishment mod + config

* updated the greate mixer workaround quest

* Rubber processing recipes audit (#949)

* Rubber recipe changes
- Latex can now be extracted from rubber trees' logs, saplings, leaves via the vacuum chamber (ULV) or extractor(LV)
- values: 1000mB per log, 100mB per sapling, 50mB per leaves; Extractor recipes do this in bulk and output 1000mB per operation
- Dandelions and goldenrods can, with added sodium hydroxide, be turned into latex in a chem reactor
- Sticky resin recipes (from both conifer pitch and latex) require wood ash now instead of sulfur
- Latex -> Vulcanized latex recipe now requires sulfur instead of wood ash
- Vulcanized latex now becomes raw rubber pulp in a solidifier or vacuum chamber at a rate of 250mB/raw pulp
- Latex soaked glove recipe now is a barrel recipe that takes 50 seconds instead of a vat recipe

* Correctly set latex soaked gloves recipe to 50 seconds (was 100 seconds in previous commit)

* Quest/patchouli book updates
- Tried to catch every mention of the old rubber making recipes.

* Revert Latex-soaked gloves recipe change as it didn't need to change
- Originally I wanted to make vulc latex -> raw rubber a Vat recipe, this isn't the case anymore so there is no reason to change this recipe.

* Rebalanced recipe values
- Logs now only give 250mB of latex
- Increase overall in time required vacuumizing directly into latex (now roughly takes 150 seconds per 1000mB, logs slightly faster)
- Gregtech fluid extraction recipes for these have been rebalanced to be around 4x faster and in bulk (roughly 37.5 seconds per 1000mB, logs slightly faster)
- Made vacuum chamber recipes use kubejs tag: field for allowing tags in recipe

* Lang & Quest updates
- Changed rubber ingot quest dependency to be on vacuum chamber instead of extractor
- Removed LV circuit quest dependency on rubber (this hasn't required rubber for a while)
- Lang changes - fix ambiguous wording, typos, titles too long for book

* updated langs

* oops, missed quest langs

* pushing algo_rithm's lang changes

* updated punishment-for-death pakku

* update configs

* langs

* Update CHANGELOG.md

* Update mods

* CHANGELOG

* Update build.yml

---------

Signed-off-by: NobleWasTaken <137561393+NobleWasTaken@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: NobleWasTaken <137561393+NobleWasTaken@users.noreply.github.com>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: AirRice <jpumph2@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
2025-05-05 21:58:47 +05:00
AirRice
49f0704298
Allow red/tin alloy double ingot piles, add textures (#948) 2025-05-03 20:44:02 +01:00
Pyritie
ee629ad1b9 fixed tfc tool tags 2025-05-02 15:46:44 +01:00
Pyritie
506faeafd3 added a potential fix for #944 suggested by ghosti, cleaned up some other abuses of it in tag events so now it's just indicators that still have to use it 2025-05-02 01:05:01 +01:00
Pyritie
2feb2f9540 remove brick duping 2025-05-01 23:37:32 +01:00
Redeix
b276adafbe - Fixed supports 2025-04-30 11:59:43 -05:00
Redeix
3299ca8ef8
Merge branch 'TerraFirmaGreg-Team:dev' into dev 2025-04-28 19:42:17 -05:00
Redeix
b1dfc5c379 - Added recipe to separate fertilizer into pure sources, and mix them back together.
- Added recipes to sew hides together and cut them apart.
2025-04-28 19:38:29 -05:00
Pyritie
70a9dfd920 Added recycling recipes for your old molds 2025-04-29 00:15:21 +01:00
Pyritie
a69e32beac changed early game recipes to use small gears instead of large, to avoid duping, and make cogs easier 2025-04-27 17:12:25 +01:00
Pyritie
b15a700cfe
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-26 15:34:35 +01:00
TomPlop
45e22aa38c
Add Brine/Vinegar to GT Machines and Fix Olive Oil recipe to fit with VAT recipe (#916)
* adding vinegar and brine recipes for GT machines

Signed-off-by: TomPlop <tomdidome@gmail.com>

* create const for alcohol vinegar recipe

Signed-off-by: TomPlop <tomdidome@gmail.com>

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-04-26 11:34:57 +01:00
Redeix
fba935817e - Added handcart recipe
- Allowed more blocks to be used as oven, forge, and bloomery insulation
- Fixed lang error with treated wood planks recipe
- Forgot to add fishing net functionality before
2025-04-26 02:35:02 -05:00
TomPlop
66b40daf7d
Fix Curdled milk recipes to be the same as the barrel
Barrel is 2B Milk 1 renet for 2B Curdled in the barrel so fixed to be the same

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-04-25 21:44:55 -04:00
Redeix
ee55e713b1 - Added support for armor trims + new materials
- Added fishing nets
- Added more cloth alternatives
2025-04-25 01:38:06 -05:00
Pyritie
d37f1baa20 why does the mortar recipe use a centrifuge? changed to a mixer 2025-04-24 22:11:04 +01:00
Pyritie
655e2685f2 added gt lathe recipe to make a tfc lens 2025-04-24 21:35:24 +01:00
Pyritie
756f27861b changed bricks and flagstones to use a cutter instead of an assembler 2025-04-24 21:35:13 +01:00
TomPlop
03fa741db6
Quests rework and small fixes (#911)
* First modification of MV Quest structure
test

* Starting some changes for quest_rework

* Fixes for scaffolding frame and bloomery steam consumption so it works with only one High pressure liquid boiler

* Big changes for quests including Ore Processing Chapter, MV Chapter without the lang file and some fixes around the quest book. Also include a fix for Steam Bloomery so it only needs 1 High Pressure Liquid Boiler to run as max parallel and the fix for scaffolding frame

* Update my branch with recent changes

* Fix for Ice to Packed Ice
2025-04-23 17:34:31 +01:00
Pyritie
ca7f66fa8f ice and sea ice can't be picked up with a saw any more, added a bunch of recipes around ice and snow for making packed ice in primitive age 2025-04-22 18:44:48 +01:00
Pyritie
d7b1304bd1 fixed red alloy/tin alloy double ingots not needing to be heated to be worked 2025-04-22 12:52:39 +01:00
Pyritie
918f3ce7e5 fixed butchery knife recipe mixup 2025-04-22 00:04:57 +01:00
Pyritie
a2d1a9bff2 cleaned up more duplicate tfc/gt recipes 2025-04-21 15:27:38 +01:00
Pyritie
4d122c614b fixed kaolin overworld spawns! I may be stupid 2025-04-21 14:10:33 +01:00
Pyritie
dde122dbed you can now put a wool cloth on a tool rack (since it's a glass blowing tool!) 2025-04-21 12:08:44 +01:00
Pyritie
cb1a7a9230 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-20 14:48:13 +01:00
Pyritie
30d25177bc fixed not being able to pick up spring water or use it in a barrel/mixing bowl 2025-04-20 14:42:51 +01:00
Pyritie
8b3745f72f
Refactored ore recipes and moved them out of TFG-Core (#888)
* refactored ore recipes and moved them out of TFG-Core. Also fixed the quern producing more output than the others, and added a workaround for the greate millstone bug

* fixed VI centrifuging recipes and bulk washing recipes to be consistent with their LV versions

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-20 13:34:41 +01:00
Pyritie
823508cba1 changed mud brick recipes so they don't need mortar any more
Fixes #622
Fixes #513
2025-04-19 14:27:26 +01:00
Pyritie
c83e05e473 added recipe to turn saplings into sticks 2025-04-19 14:16:43 +01:00
Pyritie
c2606c0c7b added recipe to empty the crucible 2025-04-19 13:43:44 +01:00
Pyritie
c7e4c03676 fixed mattock heads melting into the tfc liquid metals 2025-04-18 16:40:19 +01:00
Pyritie
189f5aebce
Alpha Release: additions 0.9.0 (#880)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Signed-off-by: Adora <adoradyne.58@gmail.com>
Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Signed-off-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
Co-authored-by: Adora <adoradyne.58@gmail.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: julia <97713533+juliakity@users.noreply.github.com>
Co-authored-by: GamerDadDave <gamerdaddave@gmail.com>
Co-authored-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Co-authored-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
2025-04-18 14:49:56 +05:00
Pyritie
ec2e3cd3c4
Alpha Release: 0.9.0 (#849)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
2025-04-15 23:27:17 +05:00
Dmitry
8e6e1318e5
Merge pull request #733 from Egogorka/fix-collapsible-bricks
Fix collapsible brick slab blocks
2025-01-26 00:03:32 +07:00
Dmitry
d8fa521bc9
Merge pull request #739 from Nebby1999/main
Feature:  Papermaking Overhaul with Wood
2025-01-26 00:00:21 +07:00
Dmitry
5a5260a542
Merge branch 'main' into main
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-25 23:58:43 +07:00
Dmitry
d8c37eac78
Merge pull request #742 from Metriximor/main
Add seaweed and kelp drying recipes
2025-01-25 23:56:42 +07:00
Dmitry
93ee99349a
Merge pull request #745 from CaptainGold1/glowstone_lamp_fuel
Add glowstone as infinite lamp fuel
2025-01-25 23:54:59 +07:00
Dmitry
ab9a22d29d
Merge pull request #753 from CaptainGold1/processed-ores-heat
Adds heat values for items with valid heating recipes but no heat values
2025-01-25 23:52:11 +07:00
Dmitry
160de3cfa7
Merge branch 'main' into TFC-magma-as-passive-boiler-heater
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-25 23:48:34 +07:00
Dmitry
811f0976b0
Merge pull request #756 from CaptainGold1/cassiterite-fix
Fixed cassiterite heating "exploit"
2025-01-25 23:47:42 +07:00
CaptainGold1
981929bab0 UNTESTED: fixes wool recipe conflict 2025-01-24 20:00:41 -06:00
SverhRazum-Nah
9ad7d5a05d
Add files via upload
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
2025-01-24 21:50:52 +03:00
CaptainGold1
8a9cd75dd6 Fixed cassiterite heating exploit 2025-01-24 12:48:21 -06:00
CaptainGold1
42e6665ee3 Added heat values for blocks and log rods 2025-01-23 23:00:09 -06:00