Commit graph

145 commits

Author SHA1 Message Date
Pyritie
5afcee46ba hide unused "unfinished" create hypertube item 2026-02-09 16:53:07 +00:00
Pyritie
114365a6f1 added optional create sound of steam recipes #2324 2026-02-08 14:13:15 +00:00
TreyR9
840d9f9b3d
Optional chimes compat (#2973)
* Update main_server_script.js

Chimes registration

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

* Chimes compat

Adds rudimentary, optional compatibility for chimes mod. Functions should only run if the mod is present. 

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

---------

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
2026-02-05 00:42:15 -06:00
Pyritie
430317bcc8 fixed missing saw recipes #2967 2026-02-03 20:39:27 +00:00
Pyritie
19bf4de976 gurman update 2026-02-02 14:54:21 +00:00
TomPlop
50eff2f5b9
Fission energy rework (#2931)
* everything should be fine

* Balance early power (#6)

* balance update

* Add textures

* last balance tweaks

* more balance

* Fix conflicts

* Balance early power (#8)

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* Isotopic solvent stuff (#10)

* push

* fix iconset issue

* adding all the textures change

* add more stuffs

* Push recipes

* new stuffs

* add stuffs

* more changes

* add textures and some recipes

* tons of change

* fix texture

* add textures and other stuffs

* more recipes

* add recycling for fission rods

* more recipes

* fix fluid textures

* comment out FLiBe again and balance rods

* fix fluids

* some latest fix

* fix more texture

* more recipe changes

* more recipes

* some last minute balance changes

* add quests

* fix conflict

* more fixes

* fix components

* var to const

---------

Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
2026-02-01 10:52:11 -06:00
Pyritie
b1fddab3e9 cleanup rock loot tables 2026-01-31 14:27:52 +00:00
Pyritie
14d20f48da #2870 fix rnr roof tags, remove framing stair/slab compat with additional placements 2026-01-31 13:09:45 +00:00
Pyritie
cafa289f76 remove create stock bridge #2915 2026-01-30 21:45:00 +00:00
Pyritie
53ab136758 add create stock bridge, add missing recipes for certus/fluix deco blocks 2026-01-23 01:43:41 +00:00
Pyritie
624d7de7e0 change fern loot tables to add straw 2026-01-19 22:15:56 +00:00
Pyritie
ed144cb8fe remove WAB structures 2026-01-17 12:00:45 +00:00
Pyritie
2e10938e1c
Refactor of material recipes (#2732)
* refactor

* phew

* drive-by fix

* all done I think

* cleaned up some lines that didn't do anything, added more comments, removed log spam
2026-01-14 21:36:52 +00:00
Pyritie
241b80a4a0 migrate everything over to linuxUnfucker() 2026-01-12 15:32:18 +00:00
Pyritie
543128e6e8 blockrunner compat 2026-01-12 09:59:54 +00:00
Inceitious
96b0e79aff
Feature/tfc tools integration (#2716)
* Bugfix/Scraping Knives

Code should be more robust now

* Recycling

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 22:01:08 -06:00
Pyritie
9e77ddfd61 more bug stuff! 2026-01-02 18:42:58 +00:00
glitch714
e699bb2789
Add scraping knives integration (#2494)
* Redid recipes

* merged recipe files

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-22 22:54:55 +00:00
Pyritie
f653703615 tags for hotornot 2025-12-09 18:51:02 +00:00
Pyritie
cc47fe55ce big tag/data refactor 2025-12-03 00:32:14 +00:00
Pyritie
1545f19ce6 big refactor of a lot of the recipe files! 2025-12-02 19:12:36 +00:00
Pyritie
53c5a20489
TFC Gurman integration (#2298)
* started working on tfc-gurman integration

* updated recipes, should be mostly good now?

* pizza adjustments

* meal bag tags

* ugh these crafting table foods are gonna take 5ever

* milk curdling and automation for new cheeses

* moved these

* Update tags.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
2025-12-01 00:35:55 +00:00
TomPlop
5491daa32f
Fission update (#2281)
* Change structure of kubejs files

* Fix some stuffs
2025-11-23 16:34:37 -06:00
Pyritie
b1da4adad6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-30 23:00:58 +00:00
Pyritie
f51861c4c9 oops missed the fission recipe call 2025-10-30 22:14:41 +00:00
GameStar
64d28c7efd
Tweak the spawn of tfg earth crops (#2125)
* this was broken I guess

* tweak these so they are a little less

idk they still seem to spawn everywhere lol

* these are better lol

* is this not in tools?
2025-10-29 22:46:00 -05:00
Pyritie
dd3215d440 big honkin recycling overhaul #1576 2025-10-26 17:49:37 +00:00
GameStar
253135b21b
Add tacz ammo boxes (#2104)
* stuff

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-25 14:41:45 -05:00
Pyritie
6ef371c99a adjustments for moon/mars mob HPs! 2025-10-06 16:07:12 +01:00
Pyritie
7a86a85f4f remove the example dea fission recipes/items 2025-10-04 15:55:58 +01:00
Pyritie
ca46b12ebe remove pcc recipes 2025-09-30 18:15:02 +01:00
Pyritie
18327e8304 add picky water wheels compat 2025-09-27 17:18:20 +01:00
Jason Nash
013c26dafa
Add igneous_intrusive to ore sack whitelist - fix #1891 (#1893)
* fix typo #1891

* typo function name

fix minor typo
2025-09-25 11:47:04 -05:00
Pyritie
c3bf45ffe6 some shield size data 2025-09-22 20:36:19 +01:00
KonSola5
033b411363
Item sizes (#1778)
* Item sizes and some helpful tags

* Try putting item sizes in a KJS script (NOT TESTED)

* Move Greate tags to KJS, add sizes for various pipes and cables

* Whoops, accidentally overrode tiny pipe size

* Air duct sizes

* Prettier config and tags moved to JS
- Added `.prettierrc` file, which configures the tab width and code wrapping point for the Prettier formatter.
- Moved remaining tags from JSON to JS files.

* Delete floating carpet tag JSON

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>

---------

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-13 13:46:20 -05:00
Pyritie
fef9da7d42 added missing recipes for macaw's barbed wire fences, replaced some of its other inputs with tags 2025-09-09 23:43:19 +01:00
Pyritie
91a78b4bfc fixed butchery knife meat bonus, added it to all the non-earth animals too 2025-09-03 21:18:51 +01:00
GameStar
d59f73b1ee
Feature/sandworm, sacks, soulbind (#1710)
* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* oops

* eater mixin stuff

* add sandworm+dep to pakku

* new configs I think

* soulbind recipes

* thumper

* Update main_server_script.js

* Update pakku-lock.json

* sack configs

* Update sns-server.toml

* Update sns-server.toml

* sack recipes and stuff

* Create soulbinding-common.toml

* soulbind fix

* Update pakku-lock.json

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

* Update recipes.js

* Delete EffekseerNativeForJava.dll

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update .gitignore

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-27 00:09:54 +01:00
GameStar
5fb7ef9093
more mars entity stuff (#1697)
* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-25 21:18:46 +01:00
Pyritie
55b56630eb changelist for tom, also removed all the redundant dusty_raw_ore item models and the old bedrock ore function 2025-08-22 12:49:53 +01:00
GameStar
3521adc4de
idk some recipes (#1635)
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-15 22:20:48 -05:00
Pyritie
63a1f0de76 treeeeeeeeees 2025-08-12 12:37:19 +01:00
GameStar
c68b78ce67
Updating guns & some bug fixes (#1501)
* new gun enables

* new modifiers

* lang

* adding data loaders

* ammo changes

* attachments

* new guns

* remove old

* updated create armorer

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* new applied armorer

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* I put the wrong one in 

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* py's fixes

* adds sandworm mod

* Delete tacz/ULVguns.zip

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* stuff

* more gun stuff

* bug fix for alabaster

* forgot to remove a log

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.alabaster.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.ammo.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* updated alabaster to match chem bath recipes

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-08-02 18:18:40 +01:00
Pyritie
14bc503908 added tags to turn phantom silk into clothes too 2025-08-02 16:52:18 +01:00
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
Redeix
2855552f11
Some fixes (#1353)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-16 09:18:54 +01:00
Pyritie
64244314e0
Updated Primitive Creatures (#1337)
* updated primitive creatures, and figured out how to make them not spawn randomly any more

* tags and items and recipes

* tweak

* langs

* adding loot

* mod ID rename

* langs

* more loot tweaks

* loot tweaks
2025-07-15 11:48:00 +01:00
Pyritie
30f50f2e97
Merging guns branch (#1283)
* Feature/ulv ev guns (#1280)

* update pakku mods

* mod config stuff

* Port over of current guns

* ae2 gun recipes

* nitrocellulose and other stuff

* more recipes

* gun packs

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update pakku-lock.json

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* LICENSE

* changed powderbarrel to use lumber instead of wood boards

* lang

* gunpowder unification

* emi categories

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-13 12:31:39 +01:00
Pyritie
54e41bf2ef 🍰🎂 2025-07-08 17:35:42 +01:00
GameStar
48d4475f6b
wire cutter mold and Hypertube compat (#1258)
* Update constants.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.molds.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Create hypertube.png

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Create recipes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update main_server_script.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-08 00:12:46 +01:00