Commit graph

376 commits

Author SHA1 Message Date
Pyritie
cbad72ecf8 added potin, cobalt, and cobalt brass as tfc metals, fixed ratios of tfc brass/bronze 2025-08-07 00:39:42 +01:00
dimethyl
b773887c45
Fix mining hammer bug (#1538)
Set correct sizes for mining hammers, wrenches, and spades

Co-authored-by: entropen1 <127608685+entropen1@users.noreply.github.com>
2025-08-06 11:12:41 +10: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
9ae18130ed fix olive food processor conflict, fix pumpkin chunk duplicate recipe 2025-08-02 15:35:16 +01:00
Pyritie
08a8e00914 added machine recipe for shears 2025-08-02 15:10:45 +01:00
Pyritie
1d326f820e merge 2025-08-01 23:15:28 +01:00
Pyritie
a94a02772f machine recipes for tuyeres #1499 2025-08-01 23:15:08 +01:00
Pyritie
937b2ac3cd
tfc invar (#1502) 2025-08-01 23:06:38 +01:00
Pyritie
5c6ecefa9a portar and mestle recipes for soybean/olive paste, salt, and melting recipes for tfc metal powders 2025-07-30 22:09:58 +01:00
Pyritie
903be368b2 fixes #1445, also added gt recipes to make alcohol for bio diesel 2025-07-29 18:44:20 +01:00
Pyritie
5582be75d2 fixes #1476 2025-07-29 17:47:24 +01:00
Zippity
5f151cdab2
Forge, Anvil Tweaks (#1417)
* rearrange anvil sequences to match convention

* add heating and melting to basic forgeable gears

* another anvil tweak

* Update changelog

* typo!

* refactor heating and forging of small gears

* refactor gear forging to use built-in material forge tier

* one last fix

---------

Signed-off-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-28 23:43:54 +01:00
Pyritie
e804a8a9dd added fluid parameter to the greenhouse recipe builder 2025-07-28 21:04:10 +01:00
Pyritie
e83833bcf5 changed all fluid tags to the new format 2025-07-28 15:46:18 +01:00
Gustavo
f3dfa471ec
Refactor & update to gt7
* gt7 removed credits/coins

* port gregtech additions to java

* add eslint locally

* add style linting

* switch target ECMA standard

* run linter

* clean up a bunch of linter errors

* remove outdated greate API calls

* forgot about the TFC multi compat issue

* reverted greate recipe removals

* some more linting stuff

* fix some issues with greenhouse recipes

* fix up some material stuff

* fix recipe types

* - Fixed single block machine rendering (#1465)

* minor fixes and changes

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-28 12:27:06 +10:00
Pyritie
d451d49800 added recipes for middle tier compost in mixer, added compostable tag to vanilla moss 2025-07-26 12:48:43 +01:00
Pyritie
5d2d61014a fixed recipe conflict with kao clay 2025-07-25 22:13:03 +01:00
Pyritie
ce21c0b4c5 fixes small spring melt amounts for #1435, also added melting recipe for nuggets 2025-07-25 12:25:48 +01:00
Pyritie
3d2ed09f9b added create sandpaper recipes for early game gems, unified observer recipes 2025-07-23 21:10:59 +01:00
Pyritie
044f13978a fixed deer dropping the wrong meat with a butchery knife 2025-07-23 14:28:46 +01:00
GameStar
96d24e7b14
Feature/tier2 rocket bugfixes (#1422)
* stuff for rocket

* worm

* Assets

* bugfix #1420

* bugfix for #1421

* rocket recipes

* color adjust fluix material

* startup rocket stuff

* everything disabling the stuff until ev

* Delete options.txt

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

* Update main_startup_script.js

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

* Delete kubejs/startup_scripts/tfg/elements.js

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

* Update CHANGELOG.md

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

* shhhhh

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-07-23 10:58:27 +01:00
Pyritie
1920173c41 fixes #1414 2025-07-22 17:02:17 +01:00
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
Pyritie
5bb1c17eae update changelog, revert unnecessary changes from #1390 2025-07-20 12:53:25 +01:00
TomPlop
3529de6be1
Fix #1373 and #1380 (#1385)
* Update quests and lang

* Changelog

* changelog

* fix conflict

* changelog

* Fix quest and add smooth stone
2025-07-19 19:59:04 +01:00
Pyritie
087170ffc9 implements #1375 2025-07-18 21:48:25 +01:00
Redeix
28d87caae3
Harvest baskets + (#1338)
* - 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

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-15 03:37:45 +01:00
Pyritie
9de6557326
nugget material fix, changelog (#1332) 2025-07-14 21:34:23 +01:00
Pyritie
8dd8d5b344 added ice soup 2025-07-14 20:00:44 +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
612015effe fixed kaolinite steam machine consistency 2025-07-11 23:20:02 +01:00
Pyritie
3dffb8e93e remove ender eye, added vitrified ender pearl 2025-07-09 00:49:02 +01:00
Pyritie
54e41bf2ef 🍰🎂 2025-07-08 17:35:42 +01:00
Pyritie
466ac32107 removed power tool recycling recipes because of duping, fixed crafting table spring recipes 2025-07-07 19:12:34 +01:00
Pyritie
df173e17ab more unification for #898, also a workaround for #963 maybe? 2025-07-07 18:54:55 +01:00
GameStar
bf1bbe12d0
Feature/new molds (#1253)
* Update recipes.js

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

* 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>

* 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 recipes.materials.js

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

* Update recipes.materials.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-07 13:17:30 +01:00
Redeix
c6a26d49b0
Hide wild crops and forgot to push some quest stuff (#1252)
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-07 01:20:51 +01:00
Pyritie
3a255f5e70 oops, greate's update meant all our macerator removals stopped working 2025-07-06 22:48:42 +01:00
Pyritie
715115820d seed oil now lasts as long as soybean oil in a lamp 2025-07-06 21:58:55 +01:00
Pyritie
88bac4db34 got the oil crops all working! 2025-07-06 16:22:01 +01:00
Pyritie
0e34f7295f added create factory logistics 2025-07-05 15:01:08 +01:00
Pyritie
f8693af91c seed oil can be used in lamps now, added recipes to get it early 2025-07-05 13:27:14 +01:00
Pyritie
0848393225 cleanup of #1248
Related Work Items: #12
2025-07-05 13:12:08 +01:00
34y34y34y34y34y34y34y34y34y
460b5db80e
Crop stuff for biodiesel, works on my machine . (#1248)
* Added the crop stuff I made so far

* I think thiss should be fine?

* I litteraly have no idea what I am doing

* I hope this fixes everything

---------

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
2025-07-05 12:15:00 +01:00
Pyritie
6bf2ad74cd
Mechanical press (#1243)
* welcome back, mechanical press

* EMI category order

* langs

* quests

* emi categories

* quests

* greate stress settings for the mech press

* I got distracted so I guess these are on this branch now

* removed welding recipes from the pressurizer

* recipe additions and changes for the mech press!

* let's go gambling!

* added flux to the mech press "welding" recipes
2025-07-05 01:41:03 +01:00
Pyritie
5fd8d896eb replaced all our water input fluids with a tag, so river water works too 2025-06-30 19:14:31 +01:00
Pyritie
27692fdf40 now only the recipes that use 8 inputs actually use 8 fertiliser 2025-06-29 20:36:25 +01:00
Redeix
5c356b0f46
Some small stuff (#1225)
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-28 11:14:05 +01:00
Pyritie
686715c251 fixed the lathe not making gem rods, also lens stuff 2025-06-28 00:57:39 +01:00
Pyritie
dc270457cd ah fuck it I'll be nice 2025-06-26 22:23:45 +01:00