Redeix
4f2a27b7b4
Merge pull request #1180 from Redeix/revert-3-feature/food
...
Revert 3 feature/food
2025-06-17 01:04:35 -05: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
2c24ad385d
Revert "Active/food ( #1176 )" ( #1177 )
...
This reverts commit 6c3fce648b
2025-06-16 23:57:48 -05:00
Redeix
6c3fce648b
Active/food ( #1176 )
...
* rearranged food recipes into hopefully a good format?
* custom gregtech machines and logic to handle TFC recipes (#1160 )
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
* update greenhouse quest
* update greenhouse tooltip
* comment out coconut milk
* langs
* tooltip fix
* wrong food lang
* recipe fixes
* Add some more food recipes (#1166 )
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
* Modify food recipes
* Add some more recipes
* add more recipes and tidy up food recipe file
* change incorrect string
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
* - Food changes
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
2025-06-16 23:54:59 -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
Redeix
c211aed518
Merge pull request #3 from TerraFirmaGreg-Team/feature/food
...
merge
2025-06-16 23:07:25 -05:00
Pyritie
553c3a9702
mushroom blocks now drop way less mushroom
2025-06-17 01:10:10 +01:00
Pyritie
bc61d06232
merge
2025-06-17 01:02:15 +01:00
dependabot[bot]
2d5ac8f982
Bump softprops/action-gh-release in the dependencies group ( #1172 )
...
Bumps the dependencies group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release ).
Updates `softprops/action-gh-release` from 2.2.2 to 2.3.2
- [Release notes](https://github.com/softprops/action-gh-release/releases )
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md )
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.2.2...v2.3.2 )
---
updated-dependencies:
- dependency-name: softprops/action-gh-release
dependency-version: 2.3.2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: dependencies
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-06-17 03:58:38 +05:00
Pyritie
dff7fd6196
material and rose quartz stuff
2025-06-16 20:32:09 +01:00
Pyritie
08b2a33443
fixed ice capsule recipe not filling it up completely
2025-06-16 18:48:34 +01:00
Pyritie
7f11bed7eb
quest updates, langs
2025-06-16 18:37:24 +01:00
Pyritie
0ecf73648d
changelog
2025-06-16 17:42:48 +01:00
Pyritie
8bc9247b24
nerfed durability of wooden tongs, slightly tweaked their recipe
2025-06-16 17:42:01 +01:00
Pyritie
242a31b515
tweaked zinc color, added new plated block color
2025-06-16 17:40:22 +01:00
Pyritie
35148eaf36
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
2025-06-16 17:12:56 +01:00
Pyritie
b2cc4beba1
fixed some VI/rolling mill recipes that were still generating for removed items
2025-06-16 17:12:53 +01:00
Jean Roberto de Souza
e35c34040d
Migmatite conflict fix ( #1153 )
...
* Migmatite conflict fixe
Tbh I can hardly call this a good fix, but tbh with Stonecutter coming back this might even be meaningless
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Update Migmatite
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Update recipes.rocks.js
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-16 11:03:14 -05:00
Pyritie
712f8a33c7
fixes #1162
2025-06-16 16:54:28 +01:00
Pyritie
6a6f72829a
removed gems tag from flint
2025-06-16 16:50:01 +01:00
Pyritie
5b0e9bda98
fixes #1165
2025-06-16 16:47:43 +01:00
Redeix
692cd26780
- Food changes ( #1167 )
2025-06-16 10:57:17 +01:00
Redeix
3f46b6856f
- Updated texture for aqueous accumulator ( #1168 )
2025-06-16 10:56:15 +01:00
Redeix
e60109bdc9
- Updated texture for aqueous accumulator
2025-06-16 01:05:29 -05:00
Redeix
787a1afe44
- Food changes
2025-06-16 00:33:37 -05:00
ofoxsmith
65f987dd4b
Add some more food recipes ( #1166 )
...
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
* Modify food recipes
* Add some more recipes
* add more recipes and tidy up food recipe file
* change incorrect string
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-15 15:03:16 -05:00
Xikaro
a6a5810b7e
bump
2025-06-13 22:11:48 +05:00
Xikaro
c8203a17ce
Update pakku-lock.json
2025-06-13 22:09:57 +05:00
Redeix
77d981c5fa
Update pakku-lock.json for lunchbox fix ( #1164 )
...
* - Update pakku-lock.json for lunchbox fix
* - Update pakku-lock.json
2025-06-13 11:43:34 -05:00
Pyritie
ffc2106945
recipe fixes
2025-06-13 00:39:27 +01:00
Pyritie
86a141881d
wrong food lang
2025-06-12 23:10:56 +01:00
Pyritie
2b2deb72fe
tooltip fix
2025-06-12 22:48:39 +01:00
Pyritie
36bc3c699c
langs
2025-06-12 22:39:25 +01:00
Pyritie
284de79e8c
comment out coconut milk
2025-06-12 21:53:25 +01:00
Pyritie
a6402c63af
update greenhouse tooltip
2025-06-12 21:53:15 +01:00
Pyritie
8b18a4c7a6
update greenhouse quest
2025-06-12 21:52:37 +01:00
Pyritie
db1907f1a5
pakku updates
2025-06-12 20:38:22 +01:00
ofoxsmith
f822289573
custom gregtech machines and logic to handle TFC recipes ( #1160 )
...
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-12 13:32:10 +01:00
Pyritie
c83dae8b7d
Merge branch 'dev' into feature/food
2025-06-12 13:27:17 +01:00
Pyritie
d7d590ee7b
lunchbox capsule recipe tweaks
2025-06-12 10:11:58 +01:00
Redeix
d12d2001c3
Update lunch box recipe ( #1159 )
...
* - Added loot table to piglin disguise and updated its texture.
- Reformated lootjs file
* - Update pakku-lock.json
* Update recipes.js
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
---------
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-12 08:27:08 +01:00
Pyritie
3dd247ab7e
pakku updates
2025-06-11 20:58:52 +01:00
Pyritie
cc26bf9fca
latex balance changes
2025-06-11 20:30:22 +01:00
Pyritie
09a9891a8a
changelog
2025-06-11 20:20:21 +01:00
Pyritie
2b0b31d5b5
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
2025-06-11 20:18:36 +01:00
Pyritie
ff49260d5f
added cinnabar to the piglin barter table
2025-06-11 20:18:34 +01:00
Pyritie
a03ea2a556
hi hecuba
2025-06-11 19:43:20 +01:00
Xikaro
c816ac4caf
Merge branch 'main' into dev
2025-06-11 16:37:32 +05:00
Redeix
390bdc3cba
Update pakku-lock ( #1157 )
...
* - Added loot table to piglin disguise and updated its texture.
- Reformated lootjs file
* - Update pakku-lock.json
2025-06-11 01:30:43 -05:00
