Commit graph

349 commits

Author SHA1 Message Date
Pyritie
c13edcabdc merge food branch into space branch 2025-06-17 12:12:43 +01:00
Redeix
50ad90af2a
Merge branch 'active/food' into revert-3-feature/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-17 00:57:55 -05:00
Redeix
2e5295614c
Revert "merge" 2025-06-17 00:56:25 -05:00
Redeix
fb90ef6666
Merge branch 'dev' into active/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-16 23:54:43 -05:00
Pyritie
bc61d06232 merge 2025-06-17 01:02:15 +01:00
Pyritie
8bc9247b24 nerfed durability of wooden tongs, slightly tweaked their recipe 2025-06-16 17:42:01 +01:00
Pyritie
5b0e9bda98 fixes #1165 2025-06-16 16:47:43 +01:00
Pyritie
b7cc04f188 merge 2025-06-12 13:33:44 +01:00
Pyritie
33088aa174 rearranged food recipes into hopefully a good format? 2025-06-10 20:13:03 +01:00
Pyritie
01ce7e19fb moved backpack size data to its own file, added lunchbox size data 2025-06-10 16:58:06 +01:00
Pyritie
9c41fe262f merge 2025-06-09 21:15:19 +01:00
Jean Roberto de Souza
8beb9ba090
Conflict issues fix (#1141)
* Remove Scaffolding Frame recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update Scaffolding Frame recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Fix Glass Jar conflict 

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-06-08 22:21:46 +01:00
Pyritie
a830260b71 chorus/lightbloom stuff 2025-06-07 23:03:41 +01:00
Pyritie
29a713cb6c asurine dust + centrifuge recipes 2025-06-07 21:29:41 +01:00
Pyritie
69b4d83067 added recipes for ae2 deco blocks, stone dust centrifuge recipes for the moon 2025-06-07 00:58:45 +01:00
Pyritie
07f984c288 yumy popped chorus fruit (needs a cooking recipe) 2025-06-06 01:22:48 +01:00
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Pyritie
ecbc791b30 better recipes for bars, doors, trapdoors 2025-06-04 23:23:45 +01:00
Pyritie
3eebef1616 more greenhouse tweaks, added a recipe for grass blocks 2025-06-04 21:49:00 +01:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +01:00
Pyritie
2027047130 reverted the sugars change 2025-06-01 18:26:42 +01:00
Pyritie
08b8cf7f1c changed the sugars recipe to just work for everything 2025-06-01 18:24:11 +01:00
Spicy Noodles
d83a774a63
TFC sugar recipes use tfg:sugars tag and kaolin dupe fix (#1099) 2025-06-01 12:21:31 -05:00
Pyritie
5efc7a607d removed the "nether hint vein" because it's just confusing people 2025-05-31 00:28:26 +01:00
Pyritie
1305d713f4 merge 2025-05-29 21:01:25 +01:00
Pyritie
ca354a55a9 updated ore vein tags so they're now all in one auto-generated file 2025-05-29 13:00:15 +01:00
Zeropol
a3715d8c46
Harmonize jars size (#1081)
* make TFC full jars the same size as empty jars

added itemSize() events for #tfc:foods/sealed_preserves and #tfc:foods/preserves. I don't understand the last parameter

* make Firmalife full jars the same size as empty jars

added itemSize() events for Firmalife full jars. I don't understand the last parameter

* Make food preserves and firmalife jar weight "medium"

By modifying server_scripts/tfc/data.js
It is to make them stack by 16.

* Update CHANGELOG.md

- Make food jars and firmalife jars stacks by 16. (#1081) #Zeropol

* Moved Firmalife's item itemSize changes to its own file

moved Firmalife related modifications from \kubejs\server_scripts\tfc\data.js to \kubejs\server_scripts\firmalife\data.js
Updated main_server_script.js

* Added ResourceLocations to itemSize()s

I advise extra scrutiny to this commit because I dont fully understand what a ResourceLocation is and how to use it.

---------

Signed-off-by: Zeropol <tn.zeropol@gmail.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-05-28 12:32:43 -05:00
Pyritie
f3769b38c3 added recipes for auto log stripping 2025-05-27 22:10:06 +01:00
Pyritie
0f9969b192 fixes #1076 2025-05-27 21:29:01 +01:00
Pyritie
d2cc83aeef fixes #1075 2025-05-27 21:08:19 +01:00
Pyritie
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
68acb6b7c1 properly fixes #1049 2025-05-21 20:50:37 +01:00
Pyritie
ea96a6c825 implements #1049 2025-05-21 12:49:04 +01:00
Pyritie
f36b590c4e fixes #1056 2025-05-21 12:33:18 +01:00
Spicy Noodles
f9c2a5f70d
Add extra small gear anvil recipes (#1041)
* Add extra small gear anvil recipes

* Update recipes.metals.js

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-05-19 02:26:39 +01:00
Pyritie
7cd9cde0b7 added circuit to the two different salt waters in the mixer 2025-05-19 00:35:14 +01:00
Pyritie
0e6b6d5998 added chisel recipes for stone walls 2025-05-18 22:06:29 +01:00
Pyritie
11b52b9ec3 made pressure plates cheaper 2025-05-18 21:51:27 +01:00
Pyritie
6048af8042
Entity loot table changes (#1035)
* trying stuff, might delete later

* updated all loot tables so looting only affects animal meat drops
2025-05-18 21:11:53 +01:00
Pyritie
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00
Risuga
165cc8d2cd
Some recipe changes (#1003)
* misc recipes

* add saw to jar lid recipe

* revert table salt name changing that didn't work
2025-05-14 19:42:32 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
3aafbc709a fixed iron door inconsistency 2025-05-11 17:24:36 +01:00
Pyritie
ec576813c2 Merge branch 'dev' into feature/space 2025-05-08 22:15:15 +01:00
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
Pyritie
fb9988f5f6 Merge branch 'dev' into feature/space 2025-05-06 12:36:09 +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